ui/views/widget/native_widget_mac.h - Issue 325163002: MacViews: Fix a forward declare of InputMethodDelegate in native_widget_private.h

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

Issue 325163002: MacViews: Fix a forward declare of InputMethodDelegate in native_widget_private.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix 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

« no previous file with comments | « no previous file | ui/views/widget/native_widget_mac.mm » ('j') | 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 "base/mac/scoped_nsobject.h"	8 #include "base/mac/scoped_nsobject.h"

9 #include "ui/gfx/native_widget_types.h"	9 #include "ui/gfx/native_widget_types.h"

10 #include "ui/views/widget/native_widget_private.h"	10 #include "ui/views/widget/native_widget_private.h"

(...skipping 22 matching lines...) Expand all Loading...
33 virtual ui::Layer* GetLayer() OVERRIDE;	33 virtual ui::Layer* GetLayer() OVERRIDE;

34 virtual void ReorderNativeViews() OVERRIDE;	34 virtual void ReorderNativeViews() OVERRIDE;

35 virtual void ViewRemoved(View* view) OVERRIDE;	35 virtual void ViewRemoved(View* view) OVERRIDE;

36 virtual void SetNativeWindowProperty(const char* name, void* value) OVERRIDE;	36 virtual void SetNativeWindowProperty(const char* name, void* value) OVERRIDE;

37 virtual void* GetNativeWindowProperty(const char* name) const OVERRIDE;	37 virtual void* GetNativeWindowProperty(const char* name) const OVERRIDE;

38 virtual TooltipManager* GetTooltipManager() const OVERRIDE;	38 virtual TooltipManager* GetTooltipManager() const OVERRIDE;

39 virtual void SetCapture() OVERRIDE;	39 virtual void SetCapture() OVERRIDE;

40 virtual void ReleaseCapture() OVERRIDE;	40 virtual void ReleaseCapture() OVERRIDE;

41 virtual bool HasCapture() const OVERRIDE;	41 virtual bool HasCapture() const OVERRIDE;

42 virtual InputMethod* CreateInputMethod() OVERRIDE;	42 virtual InputMethod* CreateInputMethod() OVERRIDE;

43 virtual InputMethodDelegate* GetInputMethodDelegate() OVERRIDE;	43 virtual internal::InputMethodDelegate* GetInputMethodDelegate() OVERRIDE;

44 virtual ui::InputMethod* GetHostInputMethod() OVERRIDE;	44 virtual ui::InputMethod* GetHostInputMethod() OVERRIDE;

45 virtual void CenterWindow(const gfx::Size& size) OVERRIDE;	45 virtual void CenterWindow(const gfx::Size& size) OVERRIDE;

46 virtual void GetWindowPlacement(	46 virtual void GetWindowPlacement(

47 gfx::Rect* bounds,	47 gfx::Rect* bounds,

48 ui::WindowShowState* maximized) const OVERRIDE;	48 ui::WindowShowState* maximized) const OVERRIDE;

49 virtual bool SetWindowTitle(const base::string16& title) OVERRIDE;	49 virtual bool SetWindowTitle(const base::string16& title) OVERRIDE;

50 virtual void SetWindowIcons(const gfx::ImageSkia& window_icon,	50 virtual void SetWindowIcons(const gfx::ImageSkia& window_icon,

51 const gfx::ImageSkia& app_icon) OVERRIDE;	51 const gfx::ImageSkia& app_icon) OVERRIDE;

52 virtual void InitModalType(ui::ModalType modal_type) OVERRIDE;	52 virtual void InitModalType(ui::ModalType modal_type) OVERRIDE;

53 virtual gfx::Rect GetWindowBoundsInScreen() const OVERRIDE;	53 virtual gfx::Rect GetWindowBoundsInScreen() const OVERRIDE;

(...skipping 52 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
106 private:	106 private:

107 internal::NativeWidgetDelegate* delegate_;	107 internal::NativeWidgetDelegate* delegate_;

108 base::scoped_nsobject<NSWindow> window_;	108 base::scoped_nsobject<NSWindow> window_;

109	109

110 DISALLOW_COPY_AND_ASSIGN(NativeWidgetMac);	110 DISALLOW_COPY_AND_ASSIGN(NativeWidgetMac);

111 };	111 };

112	112

113 } // namespace views	113 } // namespace views

114	114

115 #endif // UI_VIEWS_WIDGET_NATIVE_WIDGET_MAC_H_	115 #endif // UI_VIEWS_WIDGET_NATIVE_WIDGET_MAC_H_

OLD	NEW