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/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
9 #include "base/task/cancelable_task_tracker.h" | 9 #include "base/task/cancelable_task_tracker.h" |
10 #include "chrome/browser/chrome_browser_main_linux.h" | 10 #include "chrome/browser/chrome_browser_main_linux.h" |
11 #include "chrome/browser/chromeos/external_metrics.h" | 11 #include "chrome/browser/chromeos/external_metrics.h" |
12 #include "chromeos/system/version_loader.h" | 12 #include "chromeos/system/version_loader.h" |
13 | 13 |
14 namespace session_manager { | 14 namespace session_manager { |
15 class SessionManager; | 15 class SessionManager; |
16 } | 16 } |
17 | 17 |
18 namespace arc { | 18 namespace arc { |
19 class ArcBridgeService; | 19 class ArcBridgeService; |
| 20 class ArcInputBridge; |
20 } | 21 } |
21 | 22 |
22 namespace chromeos { | 23 namespace chromeos { |
23 | 24 |
24 class DataPromoNotification; | 25 class DataPromoNotification; |
25 class EventRewriter; | 26 class EventRewriter; |
26 class EventRewriterController; | 27 class EventRewriterController; |
27 class IdleActionWarningObserver; | 28 class IdleActionWarningObserver; |
28 class MagnificationManager; | 29 class MagnificationManager; |
29 class PeripheralBatteryObserver; | 30 class PeripheralBatteryObserver; |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
75 | 76 |
76 scoped_ptr<internal::DBusServices> dbus_services_; | 77 scoped_ptr<internal::DBusServices> dbus_services_; |
77 | 78 |
78 scoped_ptr<session_manager::SessionManager> session_manager_; | 79 scoped_ptr<session_manager::SessionManager> session_manager_; |
79 | 80 |
80 scoped_ptr<EventRewriterController> keyboard_event_rewriters_; | 81 scoped_ptr<EventRewriterController> keyboard_event_rewriters_; |
81 | 82 |
82 scoped_refptr<chromeos::ExternalMetrics> external_metrics_; | 83 scoped_refptr<chromeos::ExternalMetrics> external_metrics_; |
83 | 84 |
84 scoped_ptr<arc::ArcBridgeService> arc_bridge_service_; | 85 scoped_ptr<arc::ArcBridgeService> arc_bridge_service_; |
| 86 scoped_ptr<arc::ArcInputBridge> arc_input_bridge_; |
85 | 87 |
86 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainPartsChromeos); | 88 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainPartsChromeos); |
87 }; | 89 }; |
88 | 90 |
89 } // namespace chromeos | 91 } // namespace chromeos |
90 | 92 |
91 #endif // CHROME_BROWSER_CHROMEOS_CHROME_BROWSER_MAIN_CHROMEOS_H_ | 93 #endif // CHROME_BROWSER_CHROMEOS_CHROME_BROWSER_MAIN_CHROMEOS_H_ |
OLD | NEW |