Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(546)

Side by Side Diff: chrome/browser/chromeos/chrome_browser_main_chromeos.h

Issue 1496193002: arc: Add ArcServiceManager to own all future ARC services (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: readded file Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/chromeos/chrome_browser_main_chromeos.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 ArcServiceManager;
20 } 20 }
21 21
22 namespace chromeos { 22 namespace chromeos {
23 23
24 class DataPromoNotification; 24 class DataPromoNotification;
25 class EventRewriter; 25 class EventRewriter;
26 class EventRewriterController; 26 class EventRewriterController;
27 class IdleActionWarningObserver; 27 class IdleActionWarningObserver;
28 class MagnificationManager; 28 class MagnificationManager;
29 class PeripheralBatteryObserver; 29 class PeripheralBatteryObserver;
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 scoped_ptr<WakeOnWifiManager> wake_on_wifi_manager_; 74 scoped_ptr<WakeOnWifiManager> wake_on_wifi_manager_;
75 75
76 scoped_ptr<internal::DBusServices> dbus_services_; 76 scoped_ptr<internal::DBusServices> dbus_services_;
77 77
78 scoped_ptr<session_manager::SessionManager> session_manager_; 78 scoped_ptr<session_manager::SessionManager> session_manager_;
79 79
80 scoped_ptr<EventRewriterController> keyboard_event_rewriters_; 80 scoped_ptr<EventRewriterController> keyboard_event_rewriters_;
81 81
82 scoped_refptr<chromeos::ExternalMetrics> external_metrics_; 82 scoped_refptr<chromeos::ExternalMetrics> external_metrics_;
83 83
84 scoped_ptr<arc::ArcBridgeService> arc_bridge_service_; 84 scoped_ptr<arc::ArcServiceManager> arc_service_manager_;
85 85
86 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainPartsChromeos); 86 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainPartsChromeos);
87 }; 87 };
88 88
89 } // namespace chromeos 89 } // namespace chromeos
90 90
91 #endif // CHROME_BROWSER_CHROMEOS_CHROME_BROWSER_MAIN_CHROMEOS_H_ 91 #endif // CHROME_BROWSER_CHROMEOS_CHROME_BROWSER_MAIN_CHROMEOS_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/chrome_browser_main_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698