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

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

Issue 10913237: Allow the Views Delegate to provide the native widget. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 3 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
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_BROWSER_FRAME_AURA_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_DESKTOP_BROWSER_FRAME_AURA_H_
6 #define CHROME_BROWSER_UI_VIEWS_FRAME_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/native_widget_aura.h" 12 #include "ui/views/widget/desktop_native_widget_aura.h"
13 13
14 class BrowserFrame; 14 class BrowserFrame;
15 class BrowserView; 15 class BrowserView;
16 16
17 namespace views { 17 namespace views {
18 class MenuRunner; 18 class MenuRunner;
19 } 19 }
20 20
21 //////////////////////////////////////////////////////////////////////////////// 21 ////////////////////////////////////////////////////////////////////////////////
22 // BrowserFrameAura 22 // DesktopBrowserFrameAura
23 // 23 //
24 // BrowserFrameAura is a NativeWidgetAura subclass that provides the window 24 // DesktopBrowserFrameAura is a DesktopNativeWidgetAura subclass that provides
25 // frame for the Chrome browser window. 25 // the window frame for the Chrome browser window.
26 // 26 //
27 class BrowserFrameAura : public views::ContextMenuController, 27 class DesktopBrowserFrameAura : public views::ContextMenuController,
28 public views::NativeWidgetAura, 28 public views::DesktopNativeWidgetAura,
29 public NativeBrowserFrame { 29 public NativeBrowserFrame {
30 public: 30 public:
31 BrowserFrameAura(BrowserFrame* browser_frame, BrowserView* browser_view); 31 DesktopBrowserFrameAura(BrowserFrame* browser_frame,
32 BrowserView* browser_view);
32 33
33 BrowserView* browser_view() const { return browser_view_; } 34 BrowserView* browser_view() const { return browser_view_; }
34 35
35 protected: 36 protected:
36 // Overridden from views::ContextMenuController: 37 // Overridden from views::ContextMenuController:
37 virtual void ShowContextMenuForView(views::View* source, 38 virtual void ShowContextMenuForView(views::View* source,
38 const gfx::Point& p) OVERRIDE; 39 const gfx::Point& p) OVERRIDE;
39 40
40 // Overridden from views::NativeWidgetAura: 41 // Overridden from views::NativeWidgetAura:
41 virtual void OnWindowDestroying() OVERRIDE; 42 virtual void OnWindowDestroying() OVERRIDE;
42 virtual void OnWindowTargetVisibilityChanged(bool visible) OVERRIDE; 43 virtual void OnWindowTargetVisibilityChanged(bool visible) OVERRIDE;
43 44
44 // Overridden from NativeBrowserFrame: 45 // Overridden from NativeBrowserFrame:
45 virtual views::NativeWidget* AsNativeWidget() OVERRIDE; 46 virtual views::NativeWidget* AsNativeWidget() OVERRIDE;
46 virtual const views::NativeWidget* AsNativeWidget() const OVERRIDE; 47 virtual const views::NativeWidget* AsNativeWidget() const OVERRIDE;
47 virtual void InitSystemContextMenu() OVERRIDE; 48 virtual void InitSystemContextMenu() OVERRIDE;
48 virtual int GetMinimizeButtonOffset() const OVERRIDE; 49 virtual int GetMinimizeButtonOffset() const OVERRIDE;
49 virtual void TabStripDisplayModeChanged() OVERRIDE; 50 virtual void TabStripDisplayModeChanged() OVERRIDE;
50 51
51 private: 52 private:
52 class WindowPropertyWatcher; 53 class WindowPropertyWatcher;
53 54
54 virtual ~BrowserFrameAura(); 55 virtual ~DesktopBrowserFrameAura();
55 56
56 // The BrowserView is our ClientView. This is a pointer to it. 57 // The BrowserView is our ClientView. This is a pointer to it.
57 BrowserView* browser_view_; 58 BrowserView* browser_view_;
58 59
59 scoped_ptr<WindowPropertyWatcher> window_property_watcher_; 60 scoped_ptr<WindowPropertyWatcher> window_property_watcher_;
60 61
61 // System menu. 62 // System menu.
62 scoped_ptr<views::MenuRunner> menu_runner_; 63 scoped_ptr<views::MenuRunner> menu_runner_;
63 64
64 DISALLOW_COPY_AND_ASSIGN(BrowserFrameAura); 65 DISALLOW_COPY_AND_ASSIGN(DesktopBrowserFrameAura);
65 }; 66 };
66 67
67 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_AURA_H_ 68 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_DESKTOP_BROWSER_FRAME_AURA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698