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> | 8 #include <memory> |
9 | 9 |
10 #include "base/macros.h" | 10 #include "base/macros.h" |
11 #include "base/task/cancelable_task_tracker.h" | 11 #include "base/task/cancelable_task_tracker.h" |
12 #include "chrome/browser/chrome_browser_main_linux.h" | 12 #include "chrome/browser/chrome_browser_main_linux.h" |
13 #include "chrome/browser/chromeos/external_metrics.h" | 13 #include "chrome/browser/chromeos/external_metrics.h" |
14 #include "chromeos/system/version_loader.h" | 14 #include "chromeos/system/version_loader.h" |
15 | 15 |
16 namespace session_manager { | 16 namespace session_manager { |
17 class SessionManager; | 17 class SessionManager; |
18 } | 18 } |
19 | 19 |
20 namespace arc { | 20 namespace arc { |
21 class ArcDataManager; | |
21 class ArcServiceLauncher; | 22 class ArcServiceLauncher; |
22 } | 23 } |
23 | 24 |
24 namespace chromeos { | 25 namespace chromeos { |
25 | 26 |
26 class DataPromoNotification; | 27 class DataPromoNotification; |
27 class EventRewriter; | 28 class EventRewriter; |
28 class EventRewriterController; | 29 class EventRewriterController; |
29 class IdleActionWarningObserver; | 30 class IdleActionWarningObserver; |
30 class MagnificationManager; | 31 class MagnificationManager; |
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
77 | 78 |
78 std::unique_ptr<internal::DBusServices> dbus_services_; | 79 std::unique_ptr<internal::DBusServices> dbus_services_; |
79 | 80 |
80 std::unique_ptr<session_manager::SessionManager> session_manager_; | 81 std::unique_ptr<session_manager::SessionManager> session_manager_; |
81 | 82 |
82 std::unique_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 std::unique_ptr<arc::ArcServiceLauncher> arc_service_launcher_; | 87 std::unique_ptr<arc::ArcServiceLauncher> arc_service_launcher_; |
88 std::unique_ptr<arc::ArcDataManager> arc_data_manager_; | |
stevenjb
2016/05/13 17:13:55
We should make this part of arc_service_launcher_
dspaid
2016/05/15 23:58:51
I'm not sure I understand how this would work. Ri
stevenjb
2016/05/16 15:56:06
The current model that Arc is using, from a somewh
| |
87 | 89 |
88 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainPartsChromeos); | 90 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainPartsChromeos); |
89 }; | 91 }; |
90 | 92 |
91 } // namespace chromeos | 93 } // namespace chromeos |
92 | 94 |
93 #endif // CHROME_BROWSER_CHROMEOS_CHROME_BROWSER_MAIN_CHROMEOS_H_ | 95 #endif // CHROME_BROWSER_CHROMEOS_CHROME_BROWSER_MAIN_CHROMEOS_H_ |
OLD | NEW |