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

Side by Side Diff: ui/views/widget/desktop_aura/desktop_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/view_unittest.cc ('k') | ui/views/widget/desktop_aura/desktop_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_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_	5 #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_

6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_	6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_

7	7

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

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

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

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

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

74 virtual void FrameTypeChanged() OVERRIDE;	74 virtual void FrameTypeChanged() OVERRIDE;

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

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

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

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

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

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

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

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

83 ui::Layer** layer_parent) OVERRIDE;

84 virtual void ViewRemoved(View* view) OVERRIDE;	83 virtual void ViewRemoved(View* view) OVERRIDE;

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

86 virtual void* GetNativeWindowProperty(const char* name) const OVERRIDE;	85 virtual void* GetNativeWindowProperty(const char* name) const OVERRIDE;

87 virtual TooltipManager* GetTooltipManager() const OVERRIDE;	86 virtual TooltipManager* GetTooltipManager() const OVERRIDE;

88 virtual void SetCapture() OVERRIDE;	87 virtual void SetCapture() OVERRIDE;

89 virtual void ReleaseCapture() OVERRIDE;	88 virtual void ReleaseCapture() OVERRIDE;

90 virtual bool HasCapture() const OVERRIDE;	89 virtual bool HasCapture() const OVERRIDE;

91 virtual InputMethod* CreateInputMethod() OVERRIDE;	90 virtual InputMethod* CreateInputMethod() OVERRIDE;

92 virtual internal::InputMethodDelegate* GetInputMethodDelegate() OVERRIDE;	91 virtual internal::InputMethodDelegate* GetInputMethodDelegate() OVERRIDE;

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

(...skipping 144 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
238 bool restore_focus_on_activate_;	237 bool restore_focus_on_activate_;

239	238

240 scoped_ptr<corewm::ShadowController> shadow_controller_;	239 scoped_ptr<corewm::ShadowController> shadow_controller_;

241	240

242 DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAura);	241 DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAura);

243 };	242 };

244	243

245 } // namespace views	244 } // namespace views

246	245

247 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_	246 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_

OLD	NEW