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

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

Issue 12251017: Disabled help page than shown when USB printer connected. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 months 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | 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 #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/chromeos/chromeos_version.h" 8 #include "base/chromeos/chromeos_version.h"
9 #include "base/stl_util.h" 9 #include "base/stl_util.h"
10 #include "base/threading/platform_thread.h" 10 #include "base/threading/platform_thread.h"
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 void CrosDBusService::Initialize() { 105 void CrosDBusService::Initialize() {
106 if (g_cros_dbus_service) { 106 if (g_cros_dbus_service) {
107 LOG(WARNING) << "CrosDBusService was already initialized"; 107 LOG(WARNING) << "CrosDBusService was already initialized";
108 return; 108 return;
109 } 109 }
110 dbus::Bus* bus = DBusThreadManager::Get()->GetSystemBus(); 110 dbus::Bus* bus = DBusThreadManager::Get()->GetSystemBus();
111 if (base::chromeos::IsRunningOnChromeOS() && bus) { 111 if (base::chromeos::IsRunningOnChromeOS() && bus) {
112 CrosDBusServiceImpl* service = new CrosDBusServiceImpl(bus); 112 CrosDBusServiceImpl* service = new CrosDBusServiceImpl(bus);
113 service->RegisterServiceProvider(ProxyResolutionServiceProvider::Create()); 113 service->RegisterServiceProvider(ProxyResolutionServiceProvider::Create());
114 service->RegisterServiceProvider(new LivenessServiceProvider); 114 service->RegisterServiceProvider(new LivenessServiceProvider);
115 service->RegisterServiceProvider(new PrinterServiceProvider); 115 // TODO(vitalybuka): Re-enable after addressing privacy issues.
116 // service->RegisterServiceProvider(new PrinterServiceProvider);
116 g_cros_dbus_service = service; 117 g_cros_dbus_service = service;
117 service->Start(); 118 service->Start();
118 } else { 119 } else {
119 g_cros_dbus_service = new CrosDBusServiceStubImpl; 120 g_cros_dbus_service = new CrosDBusServiceStubImpl;
120 } 121 }
121 VLOG(1) << "CrosDBusService initialized"; 122 VLOG(1) << "CrosDBusService initialized";
122 } 123 }
123 124
124 // static 125 // static
125 void CrosDBusService::InitializeForTesting( 126 void CrosDBusService::InitializeForTesting(
(...skipping 17 matching lines...) Expand all
143 VLOG(1) << "CrosDBusService Shutdown completed"; 144 VLOG(1) << "CrosDBusService Shutdown completed";
144 } 145 }
145 146
146 CrosDBusService::~CrosDBusService() { 147 CrosDBusService::~CrosDBusService() {
147 } 148 }
148 149
149 CrosDBusService::ServiceProviderInterface::~ServiceProviderInterface() { 150 CrosDBusService::ServiceProviderInterface::~ServiceProviderInterface() {
150 } 151 }
151 152
152 } // namespace chromeos 153 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698