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_CHROMEOS_CHROME_BROWSER_MAIN_CHROMEOS_H_ | 5 #ifndef CHROME_BROWSER_CHROMEOS_CHROME_BROWSER_MAIN_CHROMEOS_H_ |
6 #define CHROME_BROWSER_CHROMEOS_CHROME_BROWSER_MAIN_CHROMEOS_H_ | 6 #define CHROME_BROWSER_CHROMEOS_CHROME_BROWSER_MAIN_CHROMEOS_H_ |
7 | 7 |
| 8 #include <memory> |
| 9 |
8 #include "base/macros.h" | 10 #include "base/macros.h" |
9 #include "base/memory/scoped_ptr.h" | |
10 #include "base/task/cancelable_task_tracker.h" | 11 #include "base/task/cancelable_task_tracker.h" |
11 #include "chrome/browser/chrome_browser_main_linux.h" | 12 #include "chrome/browser/chrome_browser_main_linux.h" |
12 #include "chrome/browser/chromeos/external_metrics.h" | 13 #include "chrome/browser/chromeos/external_metrics.h" |
13 #include "chromeos/system/version_loader.h" | 14 #include "chromeos/system/version_loader.h" |
14 | 15 |
15 namespace session_manager { | 16 namespace session_manager { |
16 class SessionManager; | 17 class SessionManager; |
17 } | 18 } |
18 | 19 |
19 namespace arc { | 20 namespace arc { |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
59 // Stages called from PreMainMessageLoopRun. | 60 // Stages called from PreMainMessageLoopRun. |
60 void PreProfileInit() override; | 61 void PreProfileInit() override; |
61 void PostProfileInit() override; | 62 void PostProfileInit() override; |
62 void PreBrowserStart() override; | 63 void PreBrowserStart() override; |
63 void PostBrowserStart() override; | 64 void PostBrowserStart() override; |
64 | 65 |
65 void PostMainMessageLoopRun() override; | 66 void PostMainMessageLoopRun() override; |
66 void PostDestroyThreads() override; | 67 void PostDestroyThreads() override; |
67 | 68 |
68 private: | 69 private: |
69 scoped_ptr<default_app_order::ExternalLoader> app_order_loader_; | 70 std::unique_ptr<default_app_order::ExternalLoader> app_order_loader_; |
70 scoped_ptr<PeripheralBatteryObserver> peripheral_battery_observer_; | 71 std::unique_ptr<PeripheralBatteryObserver> peripheral_battery_observer_; |
71 scoped_ptr<PowerPrefs> power_prefs_; | 72 std::unique_ptr<PowerPrefs> power_prefs_; |
72 scoped_ptr<PowerButtonObserver> power_button_observer_; | 73 std::unique_ptr<PowerButtonObserver> power_button_observer_; |
73 scoped_ptr<IdleActionWarningObserver> idle_action_warning_observer_; | 74 std::unique_ptr<IdleActionWarningObserver> idle_action_warning_observer_; |
74 scoped_ptr<DataPromoNotification> data_promo_notification_; | 75 std::unique_ptr<DataPromoNotification> data_promo_notification_; |
75 scoped_ptr<RendererFreezer> renderer_freezer_; | 76 std::unique_ptr<RendererFreezer> renderer_freezer_; |
76 scoped_ptr<WakeOnWifiManager> wake_on_wifi_manager_; | 77 std::unique_ptr<WakeOnWifiManager> wake_on_wifi_manager_; |
77 | 78 |
78 scoped_ptr<internal::DBusServices> dbus_services_; | 79 std::unique_ptr<internal::DBusServices> dbus_services_; |
79 | 80 |
80 scoped_ptr<session_manager::SessionManager> session_manager_; | 81 std::unique_ptr<session_manager::SessionManager> session_manager_; |
81 | 82 |
82 scoped_ptr<EventRewriterController> keyboard_event_rewriters_; | 83 std::unique_ptr<EventRewriterController> keyboard_event_rewriters_; |
83 | 84 |
84 scoped_refptr<chromeos::ExternalMetrics> external_metrics_; | 85 scoped_refptr<chromeos::ExternalMetrics> external_metrics_; |
85 | 86 |
86 scoped_ptr<arc::ArcServiceLauncher> arc_service_launcher_; | 87 std::unique_ptr<arc::ArcServiceLauncher> arc_service_launcher_; |
87 | 88 |
88 #if defined(MOJO_SHELL_CLIENT) | 89 #if defined(MOJO_SHELL_CLIENT) |
89 scoped_ptr<ChromeInterfaceFactory> interface_factory_; | 90 std::unique_ptr<ChromeInterfaceFactory> interface_factory_; |
90 #endif | 91 #endif |
91 | 92 |
92 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainPartsChromeos); | 93 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainPartsChromeos); |
93 }; | 94 }; |
94 | 95 |
95 } // namespace chromeos | 96 } // namespace chromeos |
96 | 97 |
97 #endif // CHROME_BROWSER_CHROMEOS_CHROME_BROWSER_MAIN_CHROMEOS_H_ | 98 #endif // CHROME_BROWSER_CHROMEOS_CHROME_BROWSER_MAIN_CHROMEOS_H_ |
OLD | NEW |