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

Unified Diff: ui/views/cocoa/bridged_native_widget.h

Issue 1207973002: Fixes for views_unittests on Mac after InputMethodBridge removal (DO NOT COMMIT) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@20150625-IMERefactorMac-UPSTREAM
Patch Set: 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
« no previous file with comments | « no previous file | ui/views/cocoa/bridged_native_widget.mm » ('j') | ui/views/cocoa/bridged_native_widget.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 11d5b4cfc1a45f596d1f65688ad618ff44ee0eeb..6e4cff517b5a3334d03f6d42cb846a061d398a41 100644
--- a/ui/views/cocoa/bridged_native_widget.h
+++ b/ui/views/cocoa/bridged_native_widget.h
@@ -10,6 +10,7 @@
#import "base/mac/scoped_nsobject.h"
#include "base/memory/scoped_ptr.h"
+#include "ui/base/ime/input_method_delegate.h"
#include "ui/compositor/layer_owner.h"
#import "ui/accelerated_widget_mac/accelerated_widget_mac.h"
#import "ui/views/cocoa/bridged_native_widget_owner.h"
@@ -34,12 +35,14 @@ class View;
// A bridge to an NSWindow managed by an instance of NativeWidgetMac or
// DesktopNativeWidgetMac. Serves as a helper class to bridge requests from the
// NativeWidgetMac to the Cocoa window. Behaves a bit like an aura::Window.
-class VIEWS_EXPORT BridgedNativeWidget : public ui::LayerDelegate,
- public ui::LayerOwner,
- public CocoaMouseCaptureDelegate,
- public FocusChangeListener,
- public ui::AcceleratedWidgetMacNSView,
- public BridgedNativeWidgetOwner {
+class VIEWS_EXPORT BridgedNativeWidget
+ : public ui::LayerDelegate,
+ public ui::LayerOwner,
+ public ui::internal::InputMethodDelegate,
+ public CocoaMouseCaptureDelegate,
+ public FocusChangeListener,
+ public ui::AcceleratedWidgetMacNSView,
+ public BridgedNativeWidgetOwner {
public:
// Ways of changing the visibility of the bridged NSWindow.
enum WindowVisibilityState {
@@ -165,6 +168,9 @@ class VIEWS_EXPORT BridgedNativeWidget : public ui::LayerDelegate,
bool target_fullscreen_state() const { return target_fullscreen_state_; }
bool window_visible() { return window_visible_; }
+ // Overridden from ui::internal::InputMethodDelegate:
+ bool DispatchKeyEventPostIME(const ui::KeyEvent& key) override;
+
private:
// Closes all child windows. BridgedNativeWidget children will be destroyed.
void RemoveOrDestroyChildren();
« no previous file with comments | « no previous file | ui/views/cocoa/bridged_native_widget.mm » ('j') | ui/views/cocoa/bridged_native_widget.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698