Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(805)

Unified Diff: ui/views/widget/desktop_aura/desktop_native_widget_aura.h

Issue 1177503003: Remove the 2-level input method system & InputMethodBridge. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: reverted changes for MockInputMethod. Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/views/widget/desktop_aura/desktop_native_widget_aura.h
diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura.h b/ui/views/widget/desktop_aura/desktop_native_widget_aura.h
index 88ae74a0f37325b6e08563a123f5081c69749734..489b3db6973d0e4c0b2cc4a8af21dc06d9fb28f6 100644
--- a/ui/views/widget/desktop_aura/desktop_native_widget_aura.h
+++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura.h
@@ -10,7 +10,6 @@
#include "ui/aura/window_delegate.h"
#include "ui/aura/window_tree_host_observer.h"
#include "ui/base/cursor/cursor.h"
-#include "ui/views/ime/input_method_delegate.h"
#include "ui/views/widget/native_widget_private.h"
#include "ui/wm/core/compound_event_filter.h"
#include "ui/wm/public/activation_change_observer.h"
@@ -32,7 +31,6 @@ namespace wm {
class CompoundEventFilter;
class CursorManager;
class FocusController;
-class InputMethodEventFilter;
class ShadowController;
class VisibilityController;
class WindowModalityController;
@@ -58,7 +56,6 @@ class VIEWS_EXPORT DesktopNativeWidgetAura
public aura::client::ActivationDelegate,
public aura::client::ActivationChangeObserver,
public aura::client::FocusChangeObserver,
- public views::internal::InputMethodDelegate,
public aura::client::DragDropDelegate,
public aura::WindowTreeHostObserver {
public:
@@ -112,9 +109,7 @@ class VIEWS_EXPORT DesktopNativeWidgetAura
void SetCapture() override;
void ReleaseCapture() override;
bool HasCapture() const override;
- InputMethod* CreateInputMethod() override;
- internal::InputMethodDelegate* GetInputMethodDelegate() override;
- ui::InputMethod* GetHostInputMethod() override;
+ ui::InputMethod* GetInputMethod() override;
void CenterWindow(const gfx::Size& size) override;
void GetWindowPlacement(gfx::Rect* bounds,
ui::WindowShowState* maximized) const override;
@@ -219,9 +214,6 @@ class VIEWS_EXPORT DesktopNativeWidgetAura
void OnWindowFocused(aura::Window* gained_focus,
aura::Window* lost_focus) override;
- // Overridden from views::internal::InputMethodDelegate:
- void DispatchKeyEventPostIME(const ui::KeyEvent& key) override;
-
// Overridden from aura::client::DragDropDelegate:
void OnDragEntered(const ui::DropTargetEvent& event) override;
int OnDragUpdated(const ui::DropTargetEvent& event) override;

Powered by Google App Engine
This is Rietveld 408576698