| 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/views_layout_delegate.h" |
| 12 | 13 |
| 13 namespace ui { | 14 namespace ui { |
| 14 class InputDeviceClient; | 15 class InputDeviceClient; |
| 15 } | 16 } |
| 16 | 17 |
| 17 namespace views { | 18 namespace views { |
| 18 class ViewsDelegate; | 19 class ViewsDelegate; |
| 19 } | 20 } |
| 20 | 21 |
| 21 #if defined(USE_AURA) | 22 #if defined(USE_AURA) |
| (...skipping 16 matching lines...) Expand all Loading... |
| 38 | 39 |
| 39 // Overridden from ChromeBrowserMainExtraParts: | 40 // Overridden from ChromeBrowserMainExtraParts: |
| 40 void ToolkitInitialized() override; | 41 void ToolkitInitialized() override; |
| 41 void PreCreateThreads() override; | 42 void PreCreateThreads() override; |
| 42 void PreProfileInit() override; | 43 void PreProfileInit() override; |
| 43 void ServiceManagerConnectionStarted( | 44 void ServiceManagerConnectionStarted( |
| 44 content::ServiceManagerConnection* connection) override; | 45 content::ServiceManagerConnection* connection) override; |
| 45 | 46 |
| 46 private: | 47 private: |
| 47 std::unique_ptr<views::ViewsDelegate> views_delegate_; | 48 std::unique_ptr<views::ViewsDelegate> views_delegate_; |
| 49 std::unique_ptr<views::ViewsLayoutDelegate> layout_delegate_; |
| 48 | 50 |
| 49 #if defined(USE_AURA) | 51 #if defined(USE_AURA) |
| 50 std::unique_ptr<wm::WMState> wm_state_; | 52 std::unique_ptr<wm::WMState> wm_state_; |
| 51 std::unique_ptr<views::MusClient> mus_client_; | 53 std::unique_ptr<views::MusClient> mus_client_; |
| 52 | 54 |
| 53 // Subscribes to updates about input-devices. | 55 // Subscribes to updates about input-devices. |
| 54 std::unique_ptr<ui::InputDeviceClient> input_device_client_; | 56 std::unique_ptr<ui::InputDeviceClient> input_device_client_; |
| 55 #endif | 57 #endif |
| 56 | 58 |
| 57 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsViews); | 59 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsViews); |
| 58 }; | 60 }; |
| 59 | 61 |
| 60 #endif // CHROME_BROWSER_UI_VIEWS_CHROME_BROWSER_MAIN_EXTRA_PARTS_VIEWS_H_ | 62 #endif // CHROME_BROWSER_UI_VIEWS_CHROME_BROWSER_MAIN_EXTRA_PARTS_VIEWS_H_ |
| OLD | NEW |