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

Side by Side Diff: ui/views/widget/desktop_aura/desktop_native_widget_aura.h

Issue 15114002: Reorder the NativeViews attached to a view via kViewHostKey according to the position of the view (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 | « ui/views/views.gyp ('k') | ui/views/widget/desktop_aura/desktop_native_widget_aura.cc » ('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 (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 19 matching lines...) Expand all
30 class ShadowController; 30 class ShadowController;
31 class TooltipController; 31 class TooltipController;
32 class VisibilityController; 32 class VisibilityController;
33 class WindowModalityController; 33 class WindowModalityController;
34 } 34 }
35 35
36 class DesktopRootWindowHost; 36 class DesktopRootWindowHost;
37 class DropHelper; 37 class DropHelper;
38 class NativeWidgetAuraWindowObserver; 38 class NativeWidgetAuraWindowObserver;
39 class TooltipManagerAura; 39 class TooltipManagerAura;
40 class WindowReorderer;
40 41
41 class VIEWS_EXPORT DesktopNativeWidgetAura 42 class VIEWS_EXPORT DesktopNativeWidgetAura
42 : public internal::NativeWidgetPrivate, 43 : public internal::NativeWidgetPrivate,
43 public aura::WindowDelegate, 44 public aura::WindowDelegate,
44 public aura::client::ActivationDelegate, 45 public aura::client::ActivationDelegate,
45 public aura::client::ActivationChangeObserver, 46 public aura::client::ActivationChangeObserver,
46 public aura::client::FocusChangeObserver, 47 public aura::client::FocusChangeObserver,
47 public views::internal::InputMethodDelegate, 48 public views::internal::InputMethodDelegate,
48 public aura::client::DragDropDelegate, 49 public aura::client::DragDropDelegate,
49 public aura::RootWindowObserver { 50 public aura::RootWindowObserver {
(...skipping 25 matching lines...) Expand all
75 virtual bool ShouldUseNativeFrame() const OVERRIDE; 76 virtual bool ShouldUseNativeFrame() const OVERRIDE;
76 virtual void FrameTypeChanged() OVERRIDE; 77 virtual void FrameTypeChanged() OVERRIDE;
77 virtual Widget* GetWidget() OVERRIDE; 78 virtual Widget* GetWidget() OVERRIDE;
78 virtual const Widget* GetWidget() const OVERRIDE; 79 virtual const Widget* GetWidget() const OVERRIDE;
79 virtual gfx::NativeView GetNativeView() const OVERRIDE; 80 virtual gfx::NativeView GetNativeView() const OVERRIDE;
80 virtual gfx::NativeWindow GetNativeWindow() const OVERRIDE; 81 virtual gfx::NativeWindow GetNativeWindow() const OVERRIDE;
81 virtual Widget* GetTopLevelWidget() OVERRIDE; 82 virtual Widget* GetTopLevelWidget() OVERRIDE;
82 virtual const ui::Compositor* GetCompositor() const OVERRIDE; 83 virtual const ui::Compositor* GetCompositor() const OVERRIDE;
83 virtual ui::Compositor* GetCompositor() OVERRIDE; 84 virtual ui::Compositor* GetCompositor() OVERRIDE;
84 virtual ui::Layer* GetLayer() OVERRIDE; 85 virtual ui::Layer* GetLayer() OVERRIDE;
86 virtual void ReorderNativeViews() OVERRIDE;
85 virtual void ViewRemoved(View* view) OVERRIDE; 87 virtual void ViewRemoved(View* view) OVERRIDE;
86 virtual void SetNativeWindowProperty(const char* name, void* value) OVERRIDE; 88 virtual void SetNativeWindowProperty(const char* name, void* value) OVERRIDE;
87 virtual void* GetNativeWindowProperty(const char* name) const OVERRIDE; 89 virtual void* GetNativeWindowProperty(const char* name) const OVERRIDE;
88 virtual TooltipManager* GetTooltipManager() const OVERRIDE; 90 virtual TooltipManager* GetTooltipManager() const OVERRIDE;
89 virtual void SetCapture() OVERRIDE; 91 virtual void SetCapture() OVERRIDE;
90 virtual void ReleaseCapture() OVERRIDE; 92 virtual void ReleaseCapture() OVERRIDE;
91 virtual bool HasCapture() const OVERRIDE; 93 virtual bool HasCapture() const OVERRIDE;
92 virtual InputMethod* CreateInputMethod() OVERRIDE; 94 virtual InputMethod* CreateInputMethod() OVERRIDE;
93 virtual internal::InputMethodDelegate* GetInputMethodDelegate() OVERRIDE; 95 virtual internal::InputMethodDelegate* GetInputMethodDelegate() OVERRIDE;
94 virtual void CenterWindow(const gfx::Size& size) OVERRIDE; 96 virtual void CenterWindow(const gfx::Size& size) OVERRIDE;
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 scoped_ptr<views::corewm::VisibilityController> visibility_controller_; 239 scoped_ptr<views::corewm::VisibilityController> visibility_controller_;
238 240
239 scoped_ptr<views::corewm::WindowModalityController> 241 scoped_ptr<views::corewm::WindowModalityController>
240 window_modality_controller_; 242 window_modality_controller_;
241 243
242 // See comments in OnLostActive(). 244 // See comments in OnLostActive().
243 bool restore_focus_on_activate_; 245 bool restore_focus_on_activate_;
244 246
245 scoped_ptr<corewm::ShadowController> shadow_controller_; 247 scoped_ptr<corewm::ShadowController> shadow_controller_;
246 248
249 // Reorders child windows of |window_| associated with a view based on the
250 // order of the associated views in the widget's view hierarchy.
251 scoped_ptr<WindowReorderer> window_reorderer_;
252
247 DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAura); 253 DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAura);
248 }; 254 };
249 255
250 } // namespace views 256 } // namespace views
251 257
252 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_ 258 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_
OLDNEW
« no previous file with comments | « ui/views/views.gyp ('k') | ui/views/widget/desktop_aura/desktop_native_widget_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698