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_CHROME_BROWSER_MAIN_EXTRA_PARTS_VIEWS_H_ | 5 #ifndef CHROME_BROWSER_UI_VIEWS_CHROME_BROWSER_MAIN_EXTRA_PARTS_VIEWS_H_ |
6 #define CHROME_BROWSER_UI_VIEWS_CHROME_BROWSER_MAIN_EXTRA_PARTS_VIEWS_H_ | 6 #define CHROME_BROWSER_UI_VIEWS_CHROME_BROWSER_MAIN_EXTRA_PARTS_VIEWS_H_ |
7 | 7 |
8 #include <memory> | 8 #include <memory> |
9 | 9 |
10 #include "base/macros.h" | 10 #include "base/macros.h" |
11 #include "chrome/browser/chrome_browser_main_extra_parts.h" | 11 #include "chrome/browser/chrome_browser_main_extra_parts.h" |
12 | 12 |
13 namespace views { | 13 namespace views { |
14 class ViewsDelegate; | 14 class ViewsDelegate; |
| 15 class WindowManagerConnection; |
15 } | 16 } |
16 | 17 |
17 #if defined(USE_AURA) | 18 #if defined(USE_AURA) |
18 namespace wm { | 19 namespace wm { |
19 class WMState; | 20 class WMState; |
20 } | 21 } |
21 #endif | 22 #endif |
22 | 23 |
23 class ChromeBrowserMainExtraPartsViews : public ChromeBrowserMainExtraParts { | 24 class ChromeBrowserMainExtraPartsViews : public ChromeBrowserMainExtraParts { |
24 public: | 25 public: |
25 ChromeBrowserMainExtraPartsViews(); | 26 ChromeBrowserMainExtraPartsViews(); |
26 ~ChromeBrowserMainExtraPartsViews() override; | 27 ~ChromeBrowserMainExtraPartsViews() override; |
27 | 28 |
28 // Overridden from ChromeBrowserMainExtraParts: | 29 // Overridden from ChromeBrowserMainExtraParts: |
29 void ToolkitInitialized() override; | 30 void ToolkitInitialized() override; |
30 void PreCreateThreads() override; | 31 void PreCreateThreads() override; |
31 void PreProfileInit() override; | 32 void PreProfileInit() override; |
32 | 33 |
33 private: | 34 private: |
34 std::unique_ptr<views::ViewsDelegate> views_delegate_; | 35 std::unique_ptr<views::ViewsDelegate> views_delegate_; |
35 | 36 |
36 #if defined(USE_AURA) | 37 #if defined(USE_AURA) |
37 std::unique_ptr<wm::WMState> wm_state_; | 38 std::unique_ptr<wm::WMState> wm_state_; |
38 #endif | 39 #endif |
| 40 #if defined(USE_AURA) && defined(MOJO_SHELL_CLIENT) |
| 41 std::unique_ptr<views::WindowManagerConnection> window_manager_connection_; |
| 42 #endif |
39 | 43 |
40 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsViews); | 44 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsViews); |
41 }; | 45 }; |
42 | 46 |
43 #endif // CHROME_BROWSER_UI_VIEWS_CHROME_BROWSER_MAIN_EXTRA_PARTS_VIEWS_H_ | 47 #endif // CHROME_BROWSER_UI_VIEWS_CHROME_BROWSER_MAIN_EXTRA_PARTS_VIEWS_H_ |
OLD | NEW |