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

Unified Diff: content/shell/browser/shell_browser_main_parts.cc

Issue 2338063002: chromeos: Refactor D-Bus client type enum and stub vs. fake naming (Closed)
Patch Set: review comments Created 4 years, 3 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
« no previous file with comments | « chromeos/dbus/update_engine_client.cc ('k') | extensions/shell/browser/shell_browser_main_parts.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/browser/shell_browser_main_parts.cc
diff --git a/content/shell/browser/shell_browser_main_parts.cc b/content/shell/browser/shell_browser_main_parts.cc
index 46920851800fe7799e77dcf9429d9409ad3d04ef..34d31d5f02090543c9bed7a6a39da47c85d3c45c 100644
--- a/content/shell/browser/shell_browser_main_parts.cc
+++ b/content/shell/browser/shell_browser_main_parts.cc
@@ -48,6 +48,7 @@
#include "ui/base/ime/input_method_initializer.h"
#endif
#if defined(OS_CHROMEOS)
+#include "chromeos/dbus/dbus_client_types.h"
#include "chromeos/dbus/dbus_thread_manager.h"
#include "device/bluetooth/dbus/bluez_dbus_manager.h"
#elif defined(OS_LINUX)
@@ -133,8 +134,8 @@ void ShellBrowserMainParts::PostMainMessageLoopStart() {
chromeos::DBusThreadManager::Initialize();
bluez::BluezDBusManager::Initialize(
chromeos::DBusThreadManager::Get()->GetSystemBus(),
- chromeos::DBusThreadManager::Get()->IsUsingStub(
- chromeos::DBusClientBundle::BLUETOOTH));
+ chromeos::DBusThreadManager::Get()->IsUsingFake(
+ chromeos::DBusClientType::BLUETOOTH));
#elif defined(OS_LINUX)
bluez::DBusBluezManagerWrapperLinux::Initialize();
#endif
« no previous file with comments | « chromeos/dbus/update_engine_client.cc ('k') | extensions/shell/browser/shell_browser_main_parts.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698