| 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 15 matching lines...) Expand all Loading... |
| 26 #endif | 26 #endif |
| 27 | 27 |
| 28 class ChromeBrowserMainExtraPartsViews : public ChromeBrowserMainExtraParts { | 28 class ChromeBrowserMainExtraPartsViews : public ChromeBrowserMainExtraParts { |
| 29 public: | 29 public: |
| 30 ChromeBrowserMainExtraPartsViews(); | 30 ChromeBrowserMainExtraPartsViews(); |
| 31 ~ChromeBrowserMainExtraPartsViews() override; | 31 ~ChromeBrowserMainExtraPartsViews() override; |
| 32 | 32 |
| 33 // Overridden from ChromeBrowserMainExtraParts: | 33 // Overridden from ChromeBrowserMainExtraParts: |
| 34 void ToolkitInitialized() override; | 34 void ToolkitInitialized() override; |
| 35 void PreCreateThreads() override; | 35 void PreCreateThreads() override; |
| 36 void PreProfileInit() override; | 36 void MojoShellConnectionStarted( |
| 37 content::MojoShellConnection* connection) override; |
| 37 | 38 |
| 38 private: | 39 private: |
| 39 std::unique_ptr<views::ViewsDelegate> views_delegate_; | 40 std::unique_ptr<views::ViewsDelegate> views_delegate_; |
| 40 | 41 |
| 41 #if defined(USE_AURA) | 42 #if defined(USE_AURA) |
| 42 std::unique_ptr<wm::WMState> wm_state_; | 43 std::unique_ptr<wm::WMState> wm_state_; |
| 43 std::unique_ptr<views::WindowManagerConnection> window_manager_connection_; | 44 std::unique_ptr<views::WindowManagerConnection> window_manager_connection_; |
| 44 | 45 |
| 45 // Subscribes to updates about input-devices. | 46 // Subscribes to updates about input-devices. |
| 46 std::unique_ptr<ui::InputDeviceClient> input_device_client_; | 47 std::unique_ptr<ui::InputDeviceClient> input_device_client_; |
| 47 #endif | 48 #endif |
| 48 | 49 |
| 49 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsViews); | 50 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsViews); |
| 50 }; | 51 }; |
| 51 | 52 |
| 52 #endif // CHROME_BROWSER_UI_VIEWS_CHROME_BROWSER_MAIN_EXTRA_PARTS_VIEWS_H_ | 53 #endif // CHROME_BROWSER_UI_VIEWS_CHROME_BROWSER_MAIN_EXTRA_PARTS_VIEWS_H_ |
| OLD | NEW |