| 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 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 BrowserDesktopWindowTreeHost; | 14 class BrowserDesktopWindowTreeHost; |
| 15 class BrowserFrame; | 15 class BrowserFrame; |
| 16 class BrowserView; | 16 class BrowserView; |
| 17 | 17 |
| 18 namespace aura { |
| 19 namespace client { |
| 20 class UserActionClient; |
| 21 } |
| 22 } |
| 23 |
| 18 namespace views { | 24 namespace views { |
| 19 namespace corewm { | 25 namespace corewm { |
| 20 class VisibilityController; | 26 class VisibilityController; |
| 21 } | 27 } |
| 22 } | 28 } |
| 23 | 29 |
| 24 //////////////////////////////////////////////////////////////////////////////// | 30 //////////////////////////////////////////////////////////////////////////////// |
| 25 // DesktopBrowserFrameAura | 31 // DesktopBrowserFrameAura |
| 26 // | 32 // |
| 27 // DesktopBrowserFrameAura is a DesktopNativeWidgetAura subclass that provides | 33 // DesktopBrowserFrameAura is a DesktopNativeWidgetAura subclass that provides |
| (...skipping 22 matching lines...) Expand all Loading... |
| 50 virtual int GetMinimizeButtonOffset() const OVERRIDE; | 56 virtual int GetMinimizeButtonOffset() const OVERRIDE; |
| 51 | 57 |
| 52 private: | 58 private: |
| 53 // The BrowserView is our ClientView. This is a pointer to it. | 59 // The BrowserView is our ClientView. This is a pointer to it. |
| 54 BrowserView* browser_view_; | 60 BrowserView* browser_view_; |
| 55 BrowserFrame* browser_frame_; | 61 BrowserFrame* browser_frame_; |
| 56 | 62 |
| 57 // Owned by the RootWindow. | 63 // Owned by the RootWindow. |
| 58 BrowserDesktopWindowTreeHost* browser_desktop_window_tree_host_; | 64 BrowserDesktopWindowTreeHost* browser_desktop_window_tree_host_; |
| 59 | 65 |
| 66 scoped_ptr<aura::client::UserActionClient> user_action_client_; |
| 60 scoped_ptr<views::corewm::VisibilityController> visibility_controller_; | 67 scoped_ptr<views::corewm::VisibilityController> visibility_controller_; |
| 61 | 68 |
| 62 DISALLOW_COPY_AND_ASSIGN(DesktopBrowserFrameAura); | 69 DISALLOW_COPY_AND_ASSIGN(DesktopBrowserFrameAura); |
| 63 }; | 70 }; |
| 64 | 71 |
| 65 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_DESKTOP_BROWSER_FRAME_AURA_H_ | 72 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_DESKTOP_BROWSER_FRAME_AURA_H_ |
| OLD | NEW |