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

Side by Side Diff: ui/views/widget/native_widget_mac.h

Issue 1177503003: Remove the 2-level input method system & InputMethodBridge. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nits. Created 5 years, 5 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 unified diff | Download patch
« no previous file with comments | « ui/views/widget/native_widget_delegate.h ('k') | ui/views/widget/native_widget_mac.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_VIEWS_WIDGET_NATIVE_WIDGET_MAC_H_ 5 #ifndef UI_VIEWS_WIDGET_NATIVE_WIDGET_MAC_H_
6 #define UI_VIEWS_WIDGET_NATIVE_WIDGET_MAC_H_ 6 #define UI_VIEWS_WIDGET_NATIVE_WIDGET_MAC_H_
7 7
8 #include "ui/gfx/native_widget_types.h" 8 #include "ui/gfx/native_widget_types.h"
9 #include "ui/views/widget/native_widget_private.h" 9 #include "ui/views/widget/native_widget_private.h"
10 10
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 const ui::Compositor* GetCompositor() const override; 50 const ui::Compositor* GetCompositor() const override;
51 const ui::Layer* GetLayer() const override; 51 const ui::Layer* GetLayer() const override;
52 void ReorderNativeViews() override; 52 void ReorderNativeViews() override;
53 void ViewRemoved(View* view) override; 53 void ViewRemoved(View* view) override;
54 void SetNativeWindowProperty(const char* name, void* value) override; 54 void SetNativeWindowProperty(const char* name, void* value) override;
55 void* GetNativeWindowProperty(const char* name) const override; 55 void* GetNativeWindowProperty(const char* name) const override;
56 TooltipManager* GetTooltipManager() const override; 56 TooltipManager* GetTooltipManager() const override;
57 void SetCapture() override; 57 void SetCapture() override;
58 void ReleaseCapture() override; 58 void ReleaseCapture() override;
59 bool HasCapture() const override; 59 bool HasCapture() const override;
60 InputMethod* CreateInputMethod() override; 60 ui::InputMethod* GetInputMethod() override;
61 internal::InputMethodDelegate* GetInputMethodDelegate() override;
62 ui::InputMethod* GetHostInputMethod() override;
63 void CenterWindow(const gfx::Size& size) override; 61 void CenterWindow(const gfx::Size& size) override;
64 void GetWindowPlacement(gfx::Rect* bounds, 62 void GetWindowPlacement(gfx::Rect* bounds,
65 ui::WindowShowState* show_state) const override; 63 ui::WindowShowState* show_state) const override;
66 bool SetWindowTitle(const base::string16& title) override; 64 bool SetWindowTitle(const base::string16& title) override;
67 void SetWindowIcons(const gfx::ImageSkia& window_icon, 65 void SetWindowIcons(const gfx::ImageSkia& window_icon,
68 const gfx::ImageSkia& app_icon) override; 66 const gfx::ImageSkia& app_icon) override;
69 void InitModalType(ui::ModalType modal_type) override; 67 void InitModalType(ui::ModalType modal_type) override;
70 gfx::Rect GetWindowBoundsInScreen() const override; 68 gfx::Rect GetWindowBoundsInScreen() const override;
71 gfx::Rect GetClientAreaBoundsInScreen() const override; 69 gfx::Rect GetClientAreaBoundsInScreen() const override;
72 gfx::Rect GetRestoredBounds() const override; 70 gfx::Rect GetRestoredBounds() const override;
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 scoped_ptr<BridgedNativeWidget> bridge_; 137 scoped_ptr<BridgedNativeWidget> bridge_;
140 138
141 Widget::InitParams::Ownership ownership_; 139 Widget::InitParams::Ownership ownership_;
142 140
143 DISALLOW_COPY_AND_ASSIGN(NativeWidgetMac); 141 DISALLOW_COPY_AND_ASSIGN(NativeWidgetMac);
144 }; 142 };
145 143
146 } // namespace views 144 } // namespace views
147 145
148 #endif // UI_VIEWS_WIDGET_NATIVE_WIDGET_MAC_H_ 146 #endif // UI_VIEWS_WIDGET_NATIVE_WIDGET_MAC_H_
OLDNEW
« no previous file with comments | « ui/views/widget/native_widget_delegate.h ('k') | ui/views/widget/native_widget_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698