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 #include "ui/views/layout/layout_provider.h" | 12 #include "ui/views/layout/layout_provider.h" |
13 | 13 |
14 namespace ui { | 14 namespace ui { |
15 class InputDeviceClient; | 15 class InputDeviceClient; |
16 } | 16 } |
17 | 17 |
18 namespace ui_devtools { | |
19 class UiDevToolsServer; | |
20 } | |
sadrul
2017/06/21 20:47:33
This should go below in USE_AURA #ifdef (i.e. line
thanhph
2017/06/21 23:22:46
Done.
| |
21 | |
18 namespace views { | 22 namespace views { |
19 class ViewsDelegate; | 23 class ViewsDelegate; |
20 } | 24 } |
21 | 25 |
22 #if defined(USE_AURA) | 26 #if defined(USE_AURA) |
23 namespace views { | 27 namespace views { |
24 class MusClient; | 28 class MusClient; |
25 } | 29 } |
26 namespace wm { | 30 namespace wm { |
27 class WMState; | 31 class WMState; |
(...skipping 10 matching lines...) Expand all Loading... | |
38 void PreCreateThreads() override; | 42 void PreCreateThreads() override; |
39 void PreProfileInit() override; | 43 void PreProfileInit() override; |
40 void ServiceManagerConnectionStarted( | 44 void ServiceManagerConnectionStarted( |
41 content::ServiceManagerConnection* connection) override; | 45 content::ServiceManagerConnection* connection) override; |
42 | 46 |
43 private: | 47 private: |
44 std::unique_ptr<views::ViewsDelegate> views_delegate_; | 48 std::unique_ptr<views::ViewsDelegate> views_delegate_; |
45 std::unique_ptr<views::LayoutProvider> layout_provider_; | 49 std::unique_ptr<views::LayoutProvider> layout_provider_; |
46 | 50 |
47 #if defined(USE_AURA) | 51 #if defined(USE_AURA) |
52 // Only used when running in --enable-ui-devtools. | |
53 std::unique_ptr<ui_devtools::UiDevToolsServer> devtools_server_; | |
54 | |
48 // Not created when running in ash::Config::MUS. | 55 // Not created when running in ash::Config::MUS. |
49 std::unique_ptr<wm::WMState> wm_state_; | 56 std::unique_ptr<wm::WMState> wm_state_; |
50 | 57 |
51 // Only used when running in ash::Config::MASH. | 58 // Only used when running in ash::Config::MASH. |
52 std::unique_ptr<views::MusClient> mus_client_; | 59 std::unique_ptr<views::MusClient> mus_client_; |
53 | 60 |
54 // Subscribes to updates about input-devices. | 61 // Subscribes to updates about input-devices. |
55 std::unique_ptr<ui::InputDeviceClient> input_device_client_; | 62 std::unique_ptr<ui::InputDeviceClient> input_device_client_; |
56 #endif | 63 #endif |
57 | 64 |
58 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsViews); | 65 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsViews); |
59 }; | 66 }; |
60 | 67 |
61 #endif // CHROME_BROWSER_UI_VIEWS_CHROME_BROWSER_MAIN_EXTRA_PARTS_VIEWS_H_ | 68 #endif // CHROME_BROWSER_UI_VIEWS_CHROME_BROWSER_MAIN_EXTRA_PARTS_VIEWS_H_ |
OLD | NEW |