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

Side by Side Diff: trunk/src/chromeos/dbus/shill_manager_client.cc

Issue 24293002: Revert 224179 "Track active references in ShillClientHelper" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chromeos/dbus/shill_manager_client.h" 5 #include "chromeos/dbus/shill_manager_client.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "base/values.h" 10 #include "base/values.h"
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 213
214 virtual TestInterface* GetTestInterface() OVERRIDE { 214 virtual TestInterface* GetTestInterface() OVERRIDE {
215 return NULL; 215 return NULL;
216 } 216 }
217 217
218 protected: 218 protected:
219 virtual void Init(dbus::Bus* bus) OVERRIDE { 219 virtual void Init(dbus::Bus* bus) OVERRIDE {
220 proxy_ = 220 proxy_ =
221 bus->GetObjectProxy(flimflam::kFlimflamServiceName, 221 bus->GetObjectProxy(flimflam::kFlimflamServiceName,
222 dbus::ObjectPath(flimflam::kFlimflamServicePath)); 222 dbus::ObjectPath(flimflam::kFlimflamServicePath));
223 helper_.reset(new ShillClientHelper(proxy_)); 223 helper_.reset(new ShillClientHelper(bus, proxy_));
224 helper_->MonitorPropertyChanged(flimflam::kFlimflamManagerInterface); 224 helper_->MonitorPropertyChanged(flimflam::kFlimflamManagerInterface);
225 } 225 }
226 226
227 private: 227 private:
228 dbus::ObjectProxy* proxy_; 228 dbus::ObjectProxy* proxy_;
229 scoped_ptr<ShillClientHelper> helper_; 229 scoped_ptr<ShillClientHelper> helper_;
230 230
231 DISALLOW_COPY_AND_ASSIGN(ShillManagerClientImpl); 231 DISALLOW_COPY_AND_ASSIGN(ShillManagerClientImpl);
232 }; 232 };
233 233
(...skipping 13 matching lines...) Expand all
247 } 247 }
248 248
249 // ShillManagerClient::VerificationProperties implementation. 249 // ShillManagerClient::VerificationProperties implementation.
250 ShillManagerClient::VerificationProperties::VerificationProperties() { 250 ShillManagerClient::VerificationProperties::VerificationProperties() {
251 } 251 }
252 252
253 ShillManagerClient::VerificationProperties::~VerificationProperties() { 253 ShillManagerClient::VerificationProperties::~VerificationProperties() {
254 } 254 }
255 255
256 } // namespace chromeos 256 } // namespace chromeos
OLDNEW
« no previous file with comments | « trunk/src/chromeos/dbus/shill_ipconfig_client.cc ('k') | trunk/src/chromeos/dbus/shill_profile_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698