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

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

Issue 10560014: Aura desktop: Fix tab dragging within a single chrome window. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix filename so windows is excluded. Created 8 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/base/x/x11_util.cc ('k') | ui/views/widget/desktop_native_widget_helper_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_NATIVE_WIDGET_HELPER_AURA_H_ 5 #ifndef UI_VIEWS_WIDGET_DESKTOP_NATIVE_WIDGET_HELPER_AURA_H_
6 #define UI_VIEWS_WIDGET_DESKTOP_NATIVE_WIDGET_HELPER_AURA_H_ 6 #define UI_VIEWS_WIDGET_DESKTOP_NATIVE_WIDGET_HELPER_AURA_H_
7 #pragma once 7 #pragma once
8 8
9 #include "ui/aura/root_window_observer.h" 9 #include "ui/aura/root_window_observer.h"
10 #include "ui/gfx/rect.h" 10 #include "ui/gfx/rect.h"
(...skipping 28 matching lines...) Expand all
39 39
40 // Implementation of non-Ash desktop integration code, allowing 40 // Implementation of non-Ash desktop integration code, allowing
41 // NativeWidgetAuras to work in a traditional desktop environment. 41 // NativeWidgetAuras to work in a traditional desktop environment.
42 class VIEWS_EXPORT DesktopNativeWidgetHelperAura 42 class VIEWS_EXPORT DesktopNativeWidgetHelperAura
43 : public NativeWidgetHelperAura, 43 : public NativeWidgetHelperAura,
44 public aura::RootWindowObserver { 44 public aura::RootWindowObserver {
45 public: 45 public:
46 explicit DesktopNativeWidgetHelperAura(NativeWidgetAura* widget); 46 explicit DesktopNativeWidgetHelperAura(NativeWidgetAura* widget);
47 virtual ~DesktopNativeWidgetHelperAura(); 47 virtual ~DesktopNativeWidgetHelperAura();
48 48
49 // In general, views/ does not care about the aura::RootWindow, even though
50 // at any join point with the native OS, we're going to be dealing in
51 // RootWindows.
52 static aura::Window* GetViewsWindowForRootWindow(aura::RootWindow* root);
53
49 // Overridden from aura::NativeWidgetHelperAura: 54 // Overridden from aura::NativeWidgetHelperAura:
50 virtual void PreInitialize(aura::Window* window, 55 virtual void PreInitialize(aura::Window* window,
51 const Widget::InitParams& params) OVERRIDE; 56 const Widget::InitParams& params) OVERRIDE;
52 virtual void PostInitialize() OVERRIDE; 57 virtual void PostInitialize() OVERRIDE;
53 virtual void ShowRootWindow() OVERRIDE; 58 virtual void ShowRootWindow() OVERRIDE;
54 virtual aura::RootWindow* GetRootWindow() OVERRIDE; 59 virtual aura::RootWindow* GetRootWindow() OVERRIDE;
55 virtual gfx::Rect ModifyAndSetBounds(const gfx::Rect& bounds) OVERRIDE; 60 virtual gfx::Rect ModifyAndSetBounds(const gfx::Rect& bounds) OVERRIDE;
56 61
57 // Overridden from aura::RootWindowObserver: 62 // Overridden from aura::RootWindowObserver:
58 virtual void OnRootWindowResized(const aura::RootWindow* root, 63 virtual void OnRootWindowResized(const aura::RootWindow* root,
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 #elif defined(USE_X11) 95 #elif defined(USE_X11)
91 scoped_ptr<X11WindowEventFilter> x11_window_event_filter_; 96 scoped_ptr<X11WindowEventFilter> x11_window_event_filter_;
92 #endif 97 #endif
93 98
94 DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetHelperAura); 99 DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetHelperAura);
95 }; 100 };
96 101
97 } // namespace views 102 } // namespace views
98 103
99 #endif // UI_VIEWS_WIDGET_DESKTOP_NATIVE_WIDGET_HELPER_AURA_H_ 104 #endif // UI_VIEWS_WIDGET_DESKTOP_NATIVE_WIDGET_HELPER_AURA_H_
OLDNEW
« no previous file with comments | « ui/base/x/x11_util.cc ('k') | ui/views/widget/desktop_native_widget_helper_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698