ui/views/widget/native_widget_mac.h - Issue 329463002: MacViews: Implement text input.

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

Issue 329463002: MacViews: Implement text input. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: More changes for tapted. Created 6 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 unified diff | Download patch | Annotate | Revision Log

« ui/views/cocoa/bridged_native_widget.mm ('K') | « ui/views/cocoa/bridged_native_widget_unittest.mm ('k') | no next file » | no next file with comments »

OLD	NEW
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

11 namespace views {	11 namespace views {

12	12

13 class BridgedNativeWidget;	13 class BridgedNativeWidget;

14	14

15 class VIEWS_EXPORT NativeWidgetMac : public internal::NativeWidgetPrivate {	15 class VIEWS_EXPORT NativeWidgetMac : public internal::NativeWidgetPrivate {

16 public:	16 public:

17 NativeWidgetMac(internal::NativeWidgetDelegate* delegate);	17 NativeWidgetMac(internal::NativeWidgetDelegate* delegate);

18 virtual ~NativeWidgetMac();	18 virtual ~NativeWidgetMac();

19	19

20 protected:
Andre 2014/06/19 23:22:25 This looks to be unnecessarily protected. It match This looks to be unnecessarily protected. It matches DesktopNativeWidgetAura, but in NativeWidgetAura they are public. I need to call GetWidget() from BridgedNativeWidget.
21 // internal::NativeWidgetPrivate:	20 // internal::NativeWidgetPrivate:

22 virtual void InitNativeWidget(const Widget::InitParams& params) OVERRIDE;	21 virtual void InitNativeWidget(const Widget::InitParams& params) OVERRIDE;

23 virtual NonClientFrameView* CreateNonClientFrameView() OVERRIDE;	22 virtual NonClientFrameView* CreateNonClientFrameView() OVERRIDE;

24 virtual bool ShouldUseNativeFrame() const OVERRIDE;	23 virtual bool ShouldUseNativeFrame() const OVERRIDE;

25 virtual bool ShouldWindowContentsBeTransparent() const OVERRIDE;	24 virtual bool ShouldWindowContentsBeTransparent() const OVERRIDE;

26 virtual void FrameTypeChanged() OVERRIDE;	25 virtual void FrameTypeChanged() OVERRIDE;

27 virtual Widget* GetWidget() OVERRIDE;	26 virtual Widget* GetWidget() OVERRIDE;

28 virtual const Widget* GetWidget() const OVERRIDE;	27 virtual const Widget* GetWidget() const OVERRIDE;

29 virtual gfx::NativeView GetNativeView() const OVERRIDE;	28 virtual gfx::NativeView GetNativeView() const OVERRIDE;

30 virtual gfx::NativeWindow GetNativeWindow() const OVERRIDE;	29 virtual gfx::NativeWindow GetNativeWindow() const OVERRIDE;

(...skipping 79 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
110 private:	109 private:

111 internal::NativeWidgetDelegate* delegate_;	110 internal::NativeWidgetDelegate* delegate_;

112 scoped_ptr<BridgedNativeWidget> bridge_;	111 scoped_ptr<BridgedNativeWidget> bridge_;

113	112

114 DISALLOW_COPY_AND_ASSIGN(NativeWidgetMac);	113 DISALLOW_COPY_AND_ASSIGN(NativeWidgetMac);

115 };	114 };

116	115

117 } // namespace views	116 } // namespace views

118	117

119 #endif // UI_VIEWS_WIDGET_NATIVE_WIDGET_MAC_H_	118 #endif // UI_VIEWS_WIDGET_NATIVE_WIDGET_MAC_H_

OLD	NEW