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 <memory> |
| 9 |
8 #include "base/macros.h" | 10 #include "base/macros.h" |
9 #include "base/memory/scoped_ptr.h" | |
10 #include "chrome/browser/ui/views/frame/native_browser_frame.h" | 11 #include "chrome/browser/ui/views/frame/native_browser_frame.h" |
11 #include "ui/views/context_menu_controller.h" | 12 #include "ui/views/context_menu_controller.h" |
12 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" | 13 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" |
13 | 14 |
14 class BrowserDesktopWindowTreeHost; | 15 class BrowserDesktopWindowTreeHost; |
15 class BrowserFrame; | 16 class BrowserFrame; |
16 class BrowserView; | 17 class BrowserView; |
17 | 18 |
18 namespace wm { | 19 namespace wm { |
19 class VisibilityController; | 20 class VisibilityController; |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
51 ui::WindowShowState* show_state) const override; | 52 ui::WindowShowState* show_state) const override; |
52 | 53 |
53 private: | 54 private: |
54 // The BrowserView is our ClientView. This is a pointer to it. | 55 // The BrowserView is our ClientView. This is a pointer to it. |
55 BrowserView* browser_view_; | 56 BrowserView* browser_view_; |
56 BrowserFrame* browser_frame_; | 57 BrowserFrame* browser_frame_; |
57 | 58 |
58 // Owned by the RootWindow. | 59 // Owned by the RootWindow. |
59 BrowserDesktopWindowTreeHost* browser_desktop_window_tree_host_; | 60 BrowserDesktopWindowTreeHost* browser_desktop_window_tree_host_; |
60 | 61 |
61 scoped_ptr<wm::VisibilityController> visibility_controller_; | 62 std::unique_ptr<wm::VisibilityController> visibility_controller_; |
62 | 63 |
63 DISALLOW_COPY_AND_ASSIGN(DesktopBrowserFrameAura); | 64 DISALLOW_COPY_AND_ASSIGN(DesktopBrowserFrameAura); |
64 }; | 65 }; |
65 | 66 |
66 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_DESKTOP_BROWSER_FRAME_AURA_H_ | 67 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_DESKTOP_BROWSER_FRAME_AURA_H_ |
OLD | NEW |