chrome/browser/chromeos/cros/sms_watcher.cc - Issue 10915106: Renaming instances of "flimflam" with "shill", now that we're only

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/cros/sms_watcher.cc

Issue 10915106: Renaming instances of "flimflam" with "shill", now that we're only (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Upload after merge Created 8 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

Index: chrome/browser/chromeos/cros/sms_watcher.cc

diff --git a/chrome/browser/chromeos/cros/sms_watcher.cc b/chrome/browser/chromeos/cros/sms_watcher.cc

index d7efb29f7ac1644b01bf725dea60d70b8bbb4b6b..c5a43356820de7070f032ab55de1c5a875f68b1c 100644

--- a/chrome/browser/chromeos/cros/sms_watcher.cc

+++ b/chrome/browser/chromeos/cros/sms_watcher.cc

@@ -12,7 +12,7 @@

#include "base/bind.h"

#include "base/values.h"

#include "chromeos/dbus/dbus_thread_manager.h"

-#include "chromeos/dbus/flimflam_device_client.h"

+#include "chromeos/dbus/shill_device_client.h"

#include "chromeos/dbus/gsm_sms_client.h"

#include "chromeos/dbus/modem_messaging_client.h"

#include "chromeos/dbus/sms_client.h"

@@ -364,7 +364,7 @@ SMSWatcher::SMSWatcher(const std::string& modem_device_path,

: weak_ptr_factory_(this),

device_path_(modem_device_path),

callback_(callback) {

- DBusThreadManager::Get()->GetFlimflamDeviceClient()->GetProperties(

+ DBusThreadManager::Get()->GetShillDeviceClient()->GetProperties(

dbus::ObjectPath(modem_device_path),

base::Bind(&SMSWatcher::DevicePropertiesCallback,

weak_ptr_factory_.GetWeakPtr()));

« no previous file with comments | « chrome/browser/chromeos/cros/sms_watcher.h ('k') | chrome/browser/chromeos/login/captive_portal_view.cc » ('j') | no next file with comments »