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 "base/macros.h" | 8 #include "base/macros.h" |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
10 #include "base/task/cancelable_task_tracker.h" | 10 #include "base/task/cancelable_task_tracker.h" |
11 #include "chrome/browser/chrome_browser_main_linux.h" | 11 #include "chrome/browser/chrome_browser_main_linux.h" |
12 #include "chrome/browser/chromeos/external_metrics.h" | 12 #include "chrome/browser/chromeos/external_metrics.h" |
13 #include "chromeos/system/version_loader.h" | 13 #include "chromeos/system/version_loader.h" |
14 | 14 |
15 namespace session_manager { | 15 namespace session_manager { |
16 class SessionManager; | 16 class SessionManager; |
17 } | 17 } |
18 | 18 |
19 namespace arc { | 19 namespace arc { |
20 class ArcServiceManager; | 20 class ArcServiceManager; |
21 } | 21 } |
22 | 22 |
23 namespace chromeos { | 23 namespace chromeos { |
24 | 24 |
| 25 class ChromeInterfaceFactory; |
25 class DataPromoNotification; | 26 class DataPromoNotification; |
26 class EventRewriter; | 27 class EventRewriter; |
27 class EventRewriterController; | 28 class EventRewriterController; |
28 class IdleActionWarningObserver; | 29 class IdleActionWarningObserver; |
29 class MagnificationManager; | 30 class MagnificationManager; |
30 class PeripheralBatteryObserver; | 31 class PeripheralBatteryObserver; |
31 class PowerButtonObserver; | 32 class PowerButtonObserver; |
32 class PowerPrefs; | 33 class PowerPrefs; |
33 class RendererFreezer; | 34 class RendererFreezer; |
34 class SessionManagerObserver; | 35 class SessionManagerObserver; |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
77 scoped_ptr<internal::DBusServices> dbus_services_; | 78 scoped_ptr<internal::DBusServices> dbus_services_; |
78 | 79 |
79 scoped_ptr<session_manager::SessionManager> session_manager_; | 80 scoped_ptr<session_manager::SessionManager> session_manager_; |
80 | 81 |
81 scoped_ptr<EventRewriterController> keyboard_event_rewriters_; | 82 scoped_ptr<EventRewriterController> keyboard_event_rewriters_; |
82 | 83 |
83 scoped_refptr<chromeos::ExternalMetrics> external_metrics_; | 84 scoped_refptr<chromeos::ExternalMetrics> external_metrics_; |
84 | 85 |
85 scoped_ptr<arc::ArcServiceManager> arc_service_manager_; | 86 scoped_ptr<arc::ArcServiceManager> arc_service_manager_; |
86 | 87 |
| 88 #if defined(MOJO_SHELL_CLIENT) |
| 89 scoped_ptr<ChromeInterfaceFactory> interface_factory_; |
| 90 #endif |
| 91 |
87 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainPartsChromeos); | 92 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainPartsChromeos); |
88 }; | 93 }; |
89 | 94 |
90 } // namespace chromeos | 95 } // namespace chromeos |
91 | 96 |
92 #endif // CHROME_BROWSER_CHROMEOS_CHROME_BROWSER_MAIN_CHROMEOS_H_ | 97 #endif // CHROME_BROWSER_CHROMEOS_CHROME_BROWSER_MAIN_CHROMEOS_H_ |
OLD | NEW |