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

Side by Side Diff: chrome/browser/chromeos/dbus/cros_dbus_service.cc

Issue 697493002: Support transition between chrome and user mode console (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: upload again Created 6 years, 1 month 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
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 #include "chrome/browser/chromeos/dbus/cros_dbus_service.h" 5 #include "chrome/browser/chromeos/dbus/cros_dbus_service.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/stl_util.h" 8 #include "base/stl_util.h"
9 #include "base/sys_info.h" 9 #include "base/sys_info.h"
10 #include "base/threading/platform_thread.h" 10 #include "base/threading/platform_thread.h"
11 #include "chrome/browser/chromeos/dbus/console_service_provider.h"
11 #include "chrome/browser/chromeos/dbus/display_power_service_provider.h" 12 #include "chrome/browser/chromeos/dbus/display_power_service_provider.h"
12 #include "chrome/browser/chromeos/dbus/liveness_service_provider.h" 13 #include "chrome/browser/chromeos/dbus/liveness_service_provider.h"
13 #include "chrome/browser/chromeos/dbus/printer_service_provider.h" 14 #include "chrome/browser/chromeos/dbus/printer_service_provider.h"
14 #include "chrome/browser/chromeos/dbus/proxy_resolution_service_provider.h" 15 #include "chrome/browser/chromeos/dbus/proxy_resolution_service_provider.h"
15 #include "chrome/browser/chromeos/dbus/screen_lock_service_provider.h" 16 #include "chrome/browser/chromeos/dbus/screen_lock_service_provider.h"
16 #include "chromeos/dbus/dbus_thread_manager.h" 17 #include "chromeos/dbus/dbus_thread_manager.h"
17 #include "dbus/bus.h" 18 #include "dbus/bus.h"
18 #include "dbus/exported_object.h" 19 #include "dbus/exported_object.h"
19 #include "dbus/object_path.h" 20 #include "dbus/object_path.h"
20 #include "third_party/cros_system_api/dbus/service_constants.h" 21 #include "third_party/cros_system_api/dbus/service_constants.h"
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 CrosDBusServiceImpl* service = new CrosDBusServiceImpl(bus); 124 CrosDBusServiceImpl* service = new CrosDBusServiceImpl(bus);
124 service->RegisterServiceProvider(ProxyResolutionServiceProvider::Create()); 125 service->RegisterServiceProvider(ProxyResolutionServiceProvider::Create());
125 #if !defined(USE_ATHENA) 126 #if !defined(USE_ATHENA)
126 // crbug.com/413897 127 // crbug.com/413897
127 service->RegisterServiceProvider(new DisplayPowerServiceProvider); 128 service->RegisterServiceProvider(new DisplayPowerServiceProvider);
128 // crbug.com/401285 129 // crbug.com/401285
129 service->RegisterServiceProvider(new PrinterServiceProvider); 130 service->RegisterServiceProvider(new PrinterServiceProvider);
130 #endif 131 #endif
131 service->RegisterServiceProvider(new LivenessServiceProvider); 132 service->RegisterServiceProvider(new LivenessServiceProvider);
132 service->RegisterServiceProvider(new ScreenLockServiceProvider); 133 service->RegisterServiceProvider(new ScreenLockServiceProvider);
134 service->RegisterServiceProvider(new ConsoleServiceProvider);
133 g_cros_dbus_service = service; 135 g_cros_dbus_service = service;
134 service->Start(); 136 service->Start();
135 } else { 137 } else {
136 g_cros_dbus_service = new CrosDBusServiceStubImpl; 138 g_cros_dbus_service = new CrosDBusServiceStubImpl;
137 } 139 }
138 VLOG(1) << "CrosDBusService initialized"; 140 VLOG(1) << "CrosDBusService initialized";
139 } 141 }
140 142
141 // static 143 // static
142 void CrosDBusService::InitializeForTesting( 144 void CrosDBusService::InitializeForTesting(
(...skipping 17 matching lines...) Expand all
160 VLOG(1) << "CrosDBusService Shutdown completed"; 162 VLOG(1) << "CrosDBusService Shutdown completed";
161 } 163 }
162 164
163 CrosDBusService::~CrosDBusService() { 165 CrosDBusService::~CrosDBusService() {
164 } 166 }
165 167
166 CrosDBusService::ServiceProviderInterface::~ServiceProviderInterface() { 168 CrosDBusService::ServiceProviderInterface::~ServiceProviderInterface() {
167 } 169 }
168 170
169 } // namespace chromeos 171 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698