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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chromeos/dbus/cros_dbus_service.cc

Issue 10832258: Fixes for handling of MockDBusThreadManager::GetSystemBus(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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 side-by-side diff with in-line comments
Download patch
« chrome/browser/chromeos/bluetooth/bluetooth_device.cc ('K') | « chrome/browser/chromeos/cros/cros_network_functions_unittest.cc ('k') | chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver_unittest.cc » ('j') | chrome/browser/chromeos/settings/signed_settings_helper_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/dbus/cros_dbus_service.cc
diff --git a/chrome/browser/chromeos/dbus/cros_dbus_service.cc b/chrome/browser/chromeos/dbus/cros_dbus_service.cc
index 7f821e3ed1649029672077346f4a6032cd997820..b9a4d83f20af883135e749f7610cc9ccb6046383 100644
--- a/chrome/browser/chromeos/dbus/cros_dbus_service.cc
+++ b/chrome/browser/chromeos/dbus/cros_dbus_service.cc
@@ -105,8 +105,8 @@ void CrosDBusService::Initialize() {
LOG(WARNING) << "CrosDBusService was already initialized";
return;
}
- if (base::chromeos::IsRunningOnChromeOS()) {
- dbus::Bus* bus = DBusThreadManager::Get()->GetSystemBus();
+ dbus::Bus* bus = DBusThreadManager::Get()->GetSystemBus();
+ if (base::chromeos::IsRunningOnChromeOS() && bus) {
CrosDBusServiceImpl* service = new CrosDBusServiceImpl(bus);
service->RegisterServiceProvider(ProxyResolutionServiceProvider::Create());
g_cros_dbus_service = service;
« chrome/browser/chromeos/bluetooth/bluetooth_device.cc ('K') | « chrome/browser/chromeos/cros/cros_network_functions_unittest.cc ('k') | chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver_unittest.cc » ('j') | chrome/browser/chromeos/settings/signed_settings_helper_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698