summaryrefslogtreecommitdiffstats
path: root/mojo/services
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-23 07:57:20 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-23 07:57:20 +0000
commit87d27cdd5be1249bdf010b7df2f61dbd039ae09b (patch)
tree19413508b21f2a256c1d2e898bef694459dc2110 /mojo/services
parent0403d4e525ff28c1ec88a4ea7f24092e5a6a712e (diff)
downloadchromium_src-87d27cdd5be1249bdf010b7df2f61dbd039ae09b.zip
chromium_src-87d27cdd5be1249bdf010b7df2f61dbd039ae09b.tar.gz
chromium_src-87d27cdd5be1249bdf010b7df2f61dbd039ae09b.tar.bz2
Mojo: Remove SetClient from generated interfaces
Instead, we have InterfacePtr::set_client(..) and InterfaceImpl getting a client set on it internally. This simplifies InterfaceImpl quite a bit. BUG=374436 Review URL: https://codereview.chromium.org/289063015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272441 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/services')
-rw-r--r--mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.cc2
-rw-r--r--mojo/services/view_manager/view_manager_connection_unittest.cc4
2 files changed, 3 insertions, 3 deletions
diff --git a/mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.cc b/mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.cc
index 796223f..7b58f97 100644
--- a/mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.cc
+++ b/mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.cc
@@ -413,7 +413,7 @@ ViewManagerSynchronizer::ViewManagerSynchronizer(ViewManager* view_manager)
init_loop_(NULL) {
ConnectTo(ViewManagerPrivate(view_manager_).shell(), "mojo:mojo_view_manager",
&service_);
- service_->SetClient(this);
+ service_.set_client(this);
// Start a runloop. This loop is quit when the server tells us about the
// connection (OnConnectionEstablished()).
diff --git a/mojo/services/view_manager/view_manager_connection_unittest.cc b/mojo/services/view_manager/view_manager_connection_unittest.cc
index 56caa8b..fe507b5e 100644
--- a/mojo/services/view_manager/view_manager_connection_unittest.cc
+++ b/mojo/services/view_manager/view_manager_connection_unittest.cc
@@ -377,7 +377,7 @@ class ViewManagerConnectionTest : public testing::Test {
test_helper_.Init();
ConnectTo(test_helper_.shell(), "mojo:mojo_view_manager", &view_manager_);
- view_manager_->SetClient(&client_);
+ view_manager_.set_client(&client_);
client_.WaitForId();
client_.GetAndClearChanges();
@@ -387,7 +387,7 @@ class ViewManagerConnectionTest : public testing::Test {
// Creates a second connection to the viewmanager.
void EstablishSecondConnection() {
ConnectTo(test_helper_.shell(), "mojo:mojo_view_manager", &view_manager2_);
- view_manager2_->SetClient(&client2_);
+ view_manager2_.set_client(&client2_);
client2_.WaitForId();
client2_.GetAndClearChanges();