| 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; | 19 class WindowManagerConnection; |
| 20 } | 20 } |
| 21 | 21 |
| 22 #if defined(USE_AURA) | 22 #if defined(USE_AURA) |
| 23 namespace discardable_memory { |
| 24 class ClientDiscardableSharedMemoryManager; |
| 25 } |
| 26 |
| 23 namespace wm { | 27 namespace wm { |
| 24 class WMState; | 28 class WMState; |
| 25 } | 29 } |
| 26 #endif | 30 #endif |
| 27 | 31 |
| 28 class ChromeBrowserMainExtraPartsViews : public ChromeBrowserMainExtraParts { | 32 class ChromeBrowserMainExtraPartsViews : public ChromeBrowserMainExtraParts { |
| 29 public: | 33 public: |
| 30 ChromeBrowserMainExtraPartsViews(); | 34 ChromeBrowserMainExtraPartsViews(); |
| 31 ~ChromeBrowserMainExtraPartsViews() override; | 35 ~ChromeBrowserMainExtraPartsViews() override; |
| 32 | 36 |
| 33 // Overridden from ChromeBrowserMainExtraParts: | 37 // Overridden from ChromeBrowserMainExtraParts: |
| 34 void ToolkitInitialized() override; | 38 void ToolkitInitialized() override; |
| 35 void PreCreateThreads() override; | 39 void PreCreateThreads() override; |
| 36 void PreProfileInit() override; | 40 void PreProfileInit() override; |
| 37 void ServiceManagerConnectionStarted( | 41 void ServiceManagerConnectionStarted( |
| 38 content::ServiceManagerConnection* connection) override; | 42 content::ServiceManagerConnection* connection) override; |
| 39 | 43 |
| 40 private: | 44 private: |
| 41 std::unique_ptr<views::ViewsDelegate> views_delegate_; | 45 std::unique_ptr<views::ViewsDelegate> views_delegate_; |
| 42 | 46 |
| 43 #if defined(USE_AURA) | 47 #if defined(USE_AURA) |
| 48 std::unique_ptr<discardable_memory::ClientDiscardableSharedMemoryManager> |
| 49 discardable_shared_memory_manager_; |
| 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::WindowManagerConnection> window_manager_connection_; |
| 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 |