| Index: ui/views/cocoa/bridged_native_widget.h
|
| diff --git a/ui/views/cocoa/bridged_native_widget.h b/ui/views/cocoa/bridged_native_widget.h
|
| index 5f52831ecbbff6776393bc61fb7753c8dc3b1c1d..11d5b4cfc1a45f596d1f65688ad618ff44ee0eeb 100644
|
| --- a/ui/views/cocoa/bridged_native_widget.h
|
| +++ b/ui/views/cocoa/bridged_native_widget.h
|
| @@ -15,7 +15,6 @@
|
| #import "ui/views/cocoa/bridged_native_widget_owner.h"
|
| #import "ui/views/cocoa/cocoa_mouse_capture_delegate.h"
|
| #import "ui/views/focus/focus_manager.h"
|
| -#include "ui/views/ime/input_method_delegate.h"
|
| #include "ui/views/views_export.h"
|
| #include "ui/views/widget/widget.h"
|
|
|
| @@ -29,7 +28,6 @@ class InputMethod;
|
| namespace views {
|
|
|
| class CocoaMouseCapture;
|
| -class InputMethod;
|
| class NativeWidgetMac;
|
| class View;
|
|
|
| @@ -38,7 +36,6 @@ class View;
|
| // NativeWidgetMac to the Cocoa window. Behaves a bit like an aura::Window.
|
| class VIEWS_EXPORT BridgedNativeWidget : public ui::LayerDelegate,
|
| public ui::LayerOwner,
|
| - public internal::InputMethodDelegate,
|
| public CocoaMouseCaptureDelegate,
|
| public FocusChangeListener,
|
| public ui::AcceleratedWidgetMacNSView,
|
| @@ -142,8 +139,7 @@ class VIEWS_EXPORT BridgedNativeWidget : public ui::LayerDelegate,
|
| void OnSizeConstraintsChanged();
|
|
|
| // See widget.h for documentation.
|
| - InputMethod* CreateInputMethod();
|
| - ui::InputMethod* GetHostInputMethod();
|
| + ui::InputMethod* GetInputMethod();
|
|
|
| // The restored bounds will be derived from the current NSWindow frame unless
|
| // fullscreen or transitioning between fullscreen states.
|
| @@ -169,9 +165,6 @@ class VIEWS_EXPORT BridgedNativeWidget : public ui::LayerDelegate,
|
| bool target_fullscreen_state() const { return target_fullscreen_state_; }
|
| bool window_visible() { return window_visible_; }
|
|
|
| - // Overridden from internal::InputMethodDelegate:
|
| - void DispatchKeyEventPostIME(const ui::KeyEvent& key) override;
|
| -
|
| private:
|
| // Closes all child windows. BridgedNativeWidget children will be destroyed.
|
| void RemoveOrDestroyChildren();
|
|
|