summaryrefslogtreecommitdiffstats
path: root/chrome/browser/importer
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-15 20:52:58 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-15 20:52:58 +0000
commitb44f8adbee594abffab0246815a0614675adf07b (patch)
tree149ff8b86729ab5231de82dbed4c9bd7a486b8d8 /chrome/browser/importer
parent42c83708c84fbf7041387f7417d50536823732d4 (diff)
downloadchromium_src-b44f8adbee594abffab0246815a0614675adf07b.zip
chromium_src-b44f8adbee594abffab0246815a0614675adf07b.tar.gz
chromium_src-b44f8adbee594abffab0246815a0614675adf07b.tar.bz2
Rename IPC::Channel and IPC::Sender in src/chrome.
Changes code in chrome to use the new names over the old now-typedefed-for-compat ones. BUG= TEST= Review URL: https://chromiumcodereview.appspot.com/10553010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142474 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/importer')
-rw-r--r--chrome/browser/importer/external_process_importer_bridge.cc2
-rw-r--r--chrome/browser/importer/external_process_importer_bridge.h4
-rw-r--r--chrome/browser/importer/firefox_importer_unittest_utils_mac.cc12
3 files changed, 9 insertions, 9 deletions
diff --git a/chrome/browser/importer/external_process_importer_bridge.cc b/chrome/browser/importer/external_process_importer_bridge.cc
index db305bc..b7c56cb 100644
--- a/chrome/browser/importer/external_process_importer_bridge.cc
+++ b/chrome/browser/importer/external_process_importer_bridge.cc
@@ -29,7 +29,7 @@ const int kNumFaviconsToSend = 100;
ExternalProcessImporterBridge::ExternalProcessImporterBridge(
const DictionaryValue& localized_strings,
- IPC::Message::Sender* sender,
+ IPC::Sender* sender,
base::TaskRunner* task_runner)
: sender_(sender),
task_runner_(task_runner) {
diff --git a/chrome/browser/importer/external_process_importer_bridge.h b/chrome/browser/importer/external_process_importer_bridge.h
index d7353ac..c0bf58b2 100644
--- a/chrome/browser/importer/external_process_importer_bridge.h
+++ b/chrome/browser/importer/external_process_importer_bridge.h
@@ -31,7 +31,7 @@ class ExternalProcessImporterBridge : public ImporterBridge {
public:
ExternalProcessImporterBridge(
const base::DictionaryValue& localized_strings,
- IPC::Message::Sender* sender,
+ IPC::Sender* sender,
base::TaskRunner* task_runner);
// Begin ImporterBridge implementation:
@@ -76,7 +76,7 @@ class ExternalProcessImporterBridge : public ImporterBridge {
// bundle isn't available to the external process.
scoped_ptr<base::DictionaryValue> localized_strings_;
- IPC::Message::Sender* sender_;
+ IPC::Sender* sender_;
scoped_refptr<base::TaskRunner> task_runner_;
DISALLOW_COPY_AND_ASSIGN(ExternalProcessImporterBridge);
diff --git a/chrome/browser/importer/firefox_importer_unittest_utils_mac.cc b/chrome/browser/importer/firefox_importer_unittest_utils_mac.cc
index d609cc9..b1297ee 100644
--- a/chrome/browser/importer/firefox_importer_unittest_utils_mac.cc
+++ b/chrome/browser/importer/firefox_importer_unittest_utils_mac.cc
@@ -70,12 +70,12 @@ bool LaunchNSSDecrypterChildProcess(const FilePath& nss_path,
// Method calls are sent over IPC and replies are read back into class
// variables.
// This class needs to be called on a single thread.
-class FFDecryptorServerChannelListener : public IPC::Channel::Listener {
+class FFDecryptorServerChannelListener : public IPC::Listener {
public:
FFDecryptorServerChannelListener()
: got_result(false), sender_(NULL) {}
- void SetSender(IPC::Message::Sender* sender) {
+ void SetSender(IPC::Sender* sender) {
sender_ = sender;
}
@@ -121,7 +121,7 @@ class FFDecryptorServerChannelListener : public IPC::Channel::Listener {
bool got_result;
private:
- IPC::Message::Sender* sender_; // weak
+ IPC::Sender* sender_; // weak
};
FFUnitTestDecryptorProxy::FFUnitTestDecryptorProxy()
@@ -219,12 +219,12 @@ string16 FFUnitTestDecryptorProxy::Decrypt(const std::string& crypt) {
// Class to listen on the client side of the ipc channel, it calls through
// to the NSSDecryptor and sends back a reply.
-class FFDecryptorClientChannelListener : public IPC::Channel::Listener {
+class FFDecryptorClientChannelListener : public IPC::Listener {
public:
FFDecryptorClientChannelListener()
: sender_(NULL) {}
- void SetSender(IPC::Message::Sender* sender) {
+ void SetSender(IPC::Sender* sender) {
sender_ = sender;
}
@@ -259,7 +259,7 @@ class FFDecryptorClientChannelListener : public IPC::Channel::Listener {
private:
NSSDecryptor decryptor_;
- IPC::Message::Sender* sender_;
+ IPC::Sender* sender_;
};
// Entry function in child process.