ui/views/widget/native_widget_aura.h - Issue 15922004: Rename Widget::CalculateOffsetToAncestorWithLayer() to Widget::GetLayer()

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

Issue 15922004: Rename Widget::CalculateOffsetToAncestorWithLayer() to Widget::GetLayer() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 7 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 | « ui/views/widget/desktop_aura/desktop_native_widget_aura.cc ('k') | ui/views/widget/native_widget_aura.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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_AURA_H_	5 #ifndef UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_

6 #define UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_	6 #define UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_

7	7

8 #include "base/memory/scoped_vector.h"	8 #include "base/memory/scoped_vector.h"

9 #include "base/memory/weak_ptr.h"	9 #include "base/memory/weak_ptr.h"

10 #include "ui/aura/client/activation_change_observer.h"	10 #include "ui/aura/client/activation_change_observer.h"

(...skipping 39 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
50 virtual NonClientFrameView* CreateNonClientFrameView() OVERRIDE;	50 virtual NonClientFrameView* CreateNonClientFrameView() OVERRIDE;

51 virtual bool ShouldUseNativeFrame() const OVERRIDE;	51 virtual bool ShouldUseNativeFrame() const OVERRIDE;

52 virtual void FrameTypeChanged() OVERRIDE;	52 virtual void FrameTypeChanged() OVERRIDE;

53 virtual Widget* GetWidget() OVERRIDE;	53 virtual Widget* GetWidget() OVERRIDE;

54 virtual const Widget* GetWidget() const OVERRIDE;	54 virtual const Widget* GetWidget() const OVERRIDE;

55 virtual gfx::NativeView GetNativeView() const OVERRIDE;	55 virtual gfx::NativeView GetNativeView() const OVERRIDE;

56 virtual gfx::NativeWindow GetNativeWindow() const OVERRIDE;	56 virtual gfx::NativeWindow GetNativeWindow() const OVERRIDE;

57 virtual Widget* GetTopLevelWidget() OVERRIDE;	57 virtual Widget* GetTopLevelWidget() OVERRIDE;

58 virtual const ui::Compositor* GetCompositor() const OVERRIDE;	58 virtual const ui::Compositor* GetCompositor() const OVERRIDE;

59 virtual ui::Compositor* GetCompositor() OVERRIDE;	59 virtual ui::Compositor* GetCompositor() OVERRIDE;

60 virtual gfx::Vector2d CalculateOffsetToAncestorWithLayer(	60 virtual ui::Layer* GetLayer() OVERRIDE;

61 ui::Layer** layer_parent) OVERRIDE;

62 virtual void ViewRemoved(View* view) OVERRIDE;	61 virtual void ViewRemoved(View* view) OVERRIDE;

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

64 virtual void* GetNativeWindowProperty(const char* name) const OVERRIDE;	63 virtual void* GetNativeWindowProperty(const char* name) const OVERRIDE;

65 virtual TooltipManager* GetTooltipManager() const OVERRIDE;	64 virtual TooltipManager* GetTooltipManager() const OVERRIDE;

66 virtual void SetCapture() OVERRIDE;	65 virtual void SetCapture() OVERRIDE;

67 virtual void ReleaseCapture() OVERRIDE;	66 virtual void ReleaseCapture() OVERRIDE;

68 virtual bool HasCapture() const OVERRIDE;	67 virtual bool HasCapture() const OVERRIDE;

69 virtual InputMethod* CreateInputMethod() OVERRIDE;	68 virtual InputMethod* CreateInputMethod() OVERRIDE;

70 virtual internal::InputMethodDelegate* GetInputMethodDelegate() OVERRIDE;	69 virtual internal::InputMethodDelegate* GetInputMethodDelegate() OVERRIDE;

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

(...skipping 138 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
210	209

211 scoped_ptr<DropHelper> drop_helper_;	210 scoped_ptr<DropHelper> drop_helper_;

212 int last_drop_operation_;	211 int last_drop_operation_;

213	212

214 DISALLOW_COPY_AND_ASSIGN(NativeWidgetAura);	213 DISALLOW_COPY_AND_ASSIGN(NativeWidgetAura);

215 };	214 };

216	215

217 } // namespace views	216 } // namespace views

218	217

219 #endif // UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_	218 #endif // UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_

OLD	NEW