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

Side by Side Diff: chrome/browser/ui/views/frame/desktop_browser_frame_aura.h

Issue 11316245: Move VisibilityController to corewm. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years 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
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 CHROME_BROWSER_UI_VIEWS_FRAME_DESKTOP_BROWSER_FRAME_AURA_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_DESKTOP_BROWSER_FRAME_AURA_H_
6 #define CHROME_BROWSER_UI_VIEWS_FRAME_DESKTOP_BROWSER_FRAME_AURA_H_ 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_DESKTOP_BROWSER_FRAME_AURA_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "chrome/browser/ui/views/frame/native_browser_frame.h" 10 #include "chrome/browser/ui/views/frame/native_browser_frame.h"
11 #include "ui/views/context_menu_controller.h" 11 #include "ui/views/context_menu_controller.h"
12 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" 12 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
13 13
14 class BrowserDesktopRootWindowHost; 14 class BrowserDesktopRootWindowHost;
15 class BrowserFrame; 15 class BrowserFrame;
16 class BrowserView; 16 class BrowserView;
17 17
18 namespace ash { 18 namespace views {
19 namespace internal { 19 class MenuRunner;
20 namespace corewm {
20 class VisibilityController; 21 class VisibilityController;
21 } 22 }
22 } 23 }
23 24
24 namespace views {
25 class MenuRunner;
26 }
27
28 //////////////////////////////////////////////////////////////////////////////// 25 ////////////////////////////////////////////////////////////////////////////////
29 // DesktopBrowserFrameAura 26 // DesktopBrowserFrameAura
30 // 27 //
31 // DesktopBrowserFrameAura is a DesktopNativeWidgetAura subclass that provides 28 // DesktopBrowserFrameAura is a DesktopNativeWidgetAura subclass that provides
32 // the window frame for the Chrome browser window. 29 // the window frame for the Chrome browser window.
33 // 30 //
34 class DesktopBrowserFrameAura : public views::DesktopNativeWidgetAura, 31 class DesktopBrowserFrameAura : public views::DesktopNativeWidgetAura,
35 public NativeBrowserFrame { 32 public NativeBrowserFrame {
36 public: 33 public:
37 DesktopBrowserFrameAura(BrowserFrame* browser_frame, 34 DesktopBrowserFrameAura(BrowserFrame* browser_frame,
(...skipping 20 matching lines...) Expand all
58 // The BrowserView is our ClientView. This is a pointer to it. 55 // The BrowserView is our ClientView. This is a pointer to it.
59 BrowserView* browser_view_; 56 BrowserView* browser_view_;
60 BrowserFrame* browser_frame_; 57 BrowserFrame* browser_frame_;
61 58
62 // Owned by the RootWindow. 59 // Owned by the RootWindow.
63 BrowserDesktopRootWindowHost* browser_desktop_root_window_host_; 60 BrowserDesktopRootWindowHost* browser_desktop_root_window_host_;
64 61
65 // System menu. 62 // System menu.
66 scoped_ptr<views::MenuRunner> menu_runner_; 63 scoped_ptr<views::MenuRunner> menu_runner_;
67 64
68 scoped_ptr<ash::internal::VisibilityController> visibility_controller_; 65 scoped_ptr<views::corewm::VisibilityController> visibility_controller_;
69 66
70 DISALLOW_COPY_AND_ASSIGN(DesktopBrowserFrameAura); 67 DISALLOW_COPY_AND_ASSIGN(DesktopBrowserFrameAura);
71 }; 68 };
72 69
73 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_DESKTOP_BROWSER_FRAME_AURA_H_ 70 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_DESKTOP_BROWSER_FRAME_AURA_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/constrained_window_views.cc ('k') | chrome/browser/ui/views/frame/desktop_browser_frame_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698