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

Unified Diff: src/cashew_server.cc

Issue 5284004: Revert "cashew: do not delete DBus::ObjectProxy objects from D-Bus callbacks" (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/cashew.git@master
Patch Set: Created 10 years, 1 month 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 | « src/cashew_server.h ('k') | src/main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/cashew_server.cc
diff --git a/src/cashew_server.cc b/src/cashew_server.cc
index e56829b9e50548bdd401ff463efd1e599c8d874c..dfef92fff6df7ecb2c6a14c44fc6257b745e5336 100644
--- a/src/cashew_server.cc
+++ b/src/cashew_server.cc
@@ -18,16 +18,13 @@ const char* kCashewErrorServiceUnknown =
"org.chromium.Cashew.Error.ServiceUnknown";
CashewServer::CashewServer(DBus::Connection& connection, // NOLINT
- ServiceManager * const service_manager,
- GMainLoop * const main_loop)
+ ServiceManager * const service_manager)
: DBus::ObjectAdaptor(connection, kServicePath),
- service_manager_(CHECK_NOTNULL(service_manager)),
- main_loop_(CHECK_NOTNULL(main_loop)) {
+ service_manager_(CHECK_NOTNULL(service_manager)) {
service_manager_->SetCashewServer(this);
}
CashewServer::~CashewServer() {
- DCHECK(!g_main_loop_is_running(main_loop_));
service_manager_->SetCashewServer(NULL);
}
« no previous file with comments | « src/cashew_server.h ('k') | src/main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698