| 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" |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 namespace wm { | 25 namespace wm { |
| 26 class WMState; | 26 class WMState; |
| 27 } | 27 } |
| 28 #endif | 28 #endif |
| 29 | 29 |
| 30 class ChromeBrowserMainExtraPartsViews : public ChromeBrowserMainExtraParts { | 30 class ChromeBrowserMainExtraPartsViews : public ChromeBrowserMainExtraParts { |
| 31 public: | 31 public: |
| 32 ChromeBrowserMainExtraPartsViews(); | 32 ChromeBrowserMainExtraPartsViews(); |
| 33 ~ChromeBrowserMainExtraPartsViews() override; | 33 ~ChromeBrowserMainExtraPartsViews() override; |
| 34 | 34 |
| 35 #if defined(USE_AURA) | |
| 36 wm::WMState* wm_state() { return wm_state_.get(); } | |
| 37 #endif | |
| 38 | |
| 39 // Overridden from ChromeBrowserMainExtraParts: | 35 // Overridden from ChromeBrowserMainExtraParts: |
| 40 void ToolkitInitialized() override; | 36 void ToolkitInitialized() override; |
| 41 void PreCreateThreads() override; | 37 void PreCreateThreads() override; |
| 42 void PreProfileInit() override; | 38 void PreProfileInit() override; |
| 43 void ServiceManagerConnectionStarted( | 39 void ServiceManagerConnectionStarted( |
| 44 content::ServiceManagerConnection* connection) override; | 40 content::ServiceManagerConnection* connection) override; |
| 45 | 41 |
| 46 private: | 42 private: |
| 47 std::unique_ptr<views::ViewsDelegate> views_delegate_; | 43 std::unique_ptr<views::ViewsDelegate> views_delegate_; |
| 48 | 44 |
| 49 #if defined(USE_AURA) | 45 #if defined(USE_AURA) |
| 46 // Not created when running in ash::Config::MUS. |
| 50 std::unique_ptr<wm::WMState> wm_state_; | 47 std::unique_ptr<wm::WMState> wm_state_; |
| 48 |
| 49 // Only used if ash_util::GetConfig() returns ash::Config::MASH. |
| 51 std::unique_ptr<views::MusClient> mus_client_; | 50 std::unique_ptr<views::MusClient> mus_client_; |
| 52 | 51 |
| 53 // Subscribes to updates about input-devices. | 52 // Subscribes to updates about input-devices. |
| 54 std::unique_ptr<ui::InputDeviceClient> input_device_client_; | 53 std::unique_ptr<ui::InputDeviceClient> input_device_client_; |
| 55 #endif | 54 #endif |
| 56 | 55 |
| 57 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsViews); | 56 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsViews); |
| 58 }; | 57 }; |
| 59 | 58 |
| 60 #endif // CHROME_BROWSER_UI_VIEWS_CHROME_BROWSER_MAIN_EXTRA_PARTS_VIEWS_H_ | 59 #endif // CHROME_BROWSER_UI_VIEWS_CHROME_BROWSER_MAIN_EXTRA_PARTS_VIEWS_H_ |
| OLD | NEW |