diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-28 15:28:34 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-28 13:54:51 +0000 |
commit | 2a19c63448c84c1805fb1a585c3651318bb86ca7 (patch) | |
tree | eb17888e8531aa6ee5e85721bd553b832a7e5156 /chromium/components/arc/ime/arc_ime_service.h | |
parent | b014812705fc80bff0a5c120dfcef88f349816dc (diff) | |
download | qtwebengine-chromium-2a19c63448c84c1805fb1a585c3651318bb86ca7.tar.gz |
BASELINE: Update Chromium to 69.0.3497.70
Change-Id: I2b7b56e4e7a8b26656930def0d4575dc32b900a0
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/components/arc/ime/arc_ime_service.h')
-rw-r--r-- | chromium/components/arc/ime/arc_ime_service.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/chromium/components/arc/ime/arc_ime_service.h b/chromium/components/arc/ime/arc_ime_service.h index a1beae6cdb7..23ced4fae91 100644 --- a/chromium/components/arc/ime/arc_ime_service.h +++ b/chromium/components/arc/ime/arc_ime_service.h @@ -17,7 +17,6 @@ #include "ui/base/ime/text_input_flags.h" #include "ui/base/ime/text_input_type.h" #include "ui/gfx/geometry/rect.h" -#include "ui/keyboard/keyboard_controller.h" #include "ui/keyboard/keyboard_controller_observer.h" namespace aura { @@ -85,11 +84,12 @@ class ArcImeService : public KeyedService, aura::Window* lost_focus) override; // Overridden from ArcImeBridge::Delegate: - void OnTextInputTypeChanged(ui::TextInputType type) override; + void OnTextInputTypeChanged(ui::TextInputType type, + bool is_personalized_learning_allowed) override; void OnCursorRectChanged(const gfx::Rect& rect, bool is_screen_coordinates) override; void OnCancelComposition() override; - void ShowImeIfNeeded() override; + void ShowVirtualKeyboardIfEnabled() override; void OnCursorRectChangedWithSurroundingText( const gfx::Rect& rect, const gfx::Range& text_range, @@ -137,7 +137,7 @@ class ArcImeService : public KeyedService, bool IsTextEditCommandEnabled(ui::TextEditCommand command) const override; void SetTextEditCommandForNextKeyEvent(ui::TextEditCommand command) override { } - const std::string& GetClientSourceInfo() const override; + ukm::SourceId GetClientSourceForMetrics() const override; bool ShouldDoLearning() override; // Normally, the default device scale factor is used to convert from DPI to @@ -163,6 +163,7 @@ class ArcImeService : public KeyedService, std::unique_ptr<ArcImeBridge> ime_bridge_; std::unique_ptr<ArcWindowDelegate> arc_window_delegate_; ui::TextInputType ime_type_; + bool is_personalized_learning_allowed_; gfx::Rect cursor_rect_; bool has_composition_text_; gfx::Range text_range_; @@ -171,8 +172,6 @@ class ArcImeService : public KeyedService, aura::Window* focused_arc_window_ = nullptr; - keyboard::KeyboardController* keyboard_controller_; - bool is_focus_observer_installed_; DISALLOW_COPY_AND_ASSIGN(ArcImeService); |