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 ui { | 13 namespace ui { |
14 class InputDeviceClient; | 14 class InputDeviceClient; |
15 } | 15 } |
16 | 16 |
17 namespace views { | 17 namespace views { |
18 class ViewsDelegate; | 18 class ViewsDelegate; |
19 class WindowManagerConnection; | |
20 } | 19 } |
21 | 20 |
22 #if defined(USE_AURA) | 21 #if defined(USE_AURA) |
| 22 namespace views { |
| 23 class MusClient; |
| 24 } |
23 namespace wm { | 25 namespace wm { |
24 class WMState; | 26 class WMState; |
25 } | 27 } |
26 #endif | 28 #endif |
27 | 29 |
28 class ChromeBrowserMainExtraPartsViews : public ChromeBrowserMainExtraParts { | 30 class ChromeBrowserMainExtraPartsViews : public ChromeBrowserMainExtraParts { |
29 public: | 31 public: |
30 ChromeBrowserMainExtraPartsViews(); | 32 ChromeBrowserMainExtraPartsViews(); |
31 ~ChromeBrowserMainExtraPartsViews() override; | 33 ~ChromeBrowserMainExtraPartsViews() override; |
32 | 34 |
| 35 #if defined(USE_AURA) |
| 36 wm::WMState* wm_state() { return wm_state_.get(); } |
| 37 #endif |
| 38 |
33 // Overridden from ChromeBrowserMainExtraParts: | 39 // Overridden from ChromeBrowserMainExtraParts: |
34 void ToolkitInitialized() override; | 40 void ToolkitInitialized() override; |
35 void PreCreateThreads() override; | 41 void PreCreateThreads() override; |
36 void PreProfileInit() override; | 42 void PreProfileInit() override; |
37 void ServiceManagerConnectionStarted( | 43 void ServiceManagerConnectionStarted( |
38 content::ServiceManagerConnection* connection) override; | 44 content::ServiceManagerConnection* connection) override; |
39 | 45 |
40 private: | 46 private: |
41 std::unique_ptr<views::ViewsDelegate> views_delegate_; | 47 std::unique_ptr<views::ViewsDelegate> views_delegate_; |
42 | 48 |
43 #if defined(USE_AURA) | 49 #if defined(USE_AURA) |
44 std::unique_ptr<wm::WMState> wm_state_; | 50 std::unique_ptr<wm::WMState> wm_state_; |
45 std::unique_ptr<views::WindowManagerConnection> window_manager_connection_; | 51 std::unique_ptr<views::MusClient> mus_client_; |
46 | 52 |
47 // Subscribes to updates about input-devices. | 53 // Subscribes to updates about input-devices. |
48 std::unique_ptr<ui::InputDeviceClient> input_device_client_; | 54 std::unique_ptr<ui::InputDeviceClient> input_device_client_; |
49 #endif | 55 #endif |
50 | 56 |
51 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsViews); | 57 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsViews); |
52 }; | 58 }; |
53 | 59 |
54 #endif // CHROME_BROWSER_UI_VIEWS_CHROME_BROWSER_MAIN_EXTRA_PARTS_VIEWS_H_ | 60 #endif // CHROME_BROWSER_UI_VIEWS_CHROME_BROWSER_MAIN_EXTRA_PARTS_VIEWS_H_ |
OLD | NEW |