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

Unified Diff: src/cashew_server.cc

Issue 3528016: Cashew: implement backend usage API (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/cashew.git
Patch Set: Fix code review nits and remove hardcoded usage URLs Created 10 years, 2 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
« no previous file with comments | « src/cashew_server.h ('k') | src/data_plan.h » ('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 54c528109322a78511bc97dd12eab9bfb7d89df1..dfef92fff6df7ecb2c6a14c44fc6257b745e5336 100644
--- a/src/cashew_server.cc
+++ b/src/cashew_server.cc
@@ -6,6 +6,8 @@
#include <glog/logging.h>
+#include "src/service_manager.h"
+
namespace cashew {
const char* CashewServer::kServiceName = "org.chromium.Cashew";
@@ -16,12 +18,14 @@ const char* kCashewErrorServiceUnknown =
"org.chromium.Cashew.Error.ServiceUnknown";
CashewServer::CashewServer(DBus::Connection& connection, // NOLINT
- const ServiceManager& service_manager)
+ ServiceManager * const service_manager)
: DBus::ObjectAdaptor(connection, kServicePath),
- service_manager_(service_manager) {
+ service_manager_(CHECK_NOTNULL(service_manager)) {
+ service_manager_->SetCashewServer(this);
}
CashewServer::~CashewServer() {
+ service_manager_->SetCashewServer(NULL);
}
// Cashew D-Bus API methods
@@ -30,7 +34,7 @@ DBusDataPlanList CashewServer::GetDataPlans(const std::string& service_path,
DBus::Error& error) { // NOLINT
DLOG(INFO) << "GetDataPlans: service = " << service_path;
DBusDataPlanList dbus_data_plans;
- const Service *service = service_manager_.GetService(service_path);
+ const Service *service = service_manager_->GetService(service_path);
if (service == NULL) {
DLOG(WARNING) << "GetDataPlans: unknown service: " << service_path;
error.set(kCashewErrorServiceUnknown, service_path.c_str());
@@ -44,7 +48,7 @@ DBusDataPlanList CashewServer::GetDataPlans(const std::string& service_path,
void CashewServer::RequestDataPlansUpdate(const std::string& service_path,
DBus::Error& error) { // NOLINT
DLOG(INFO) << "RequestDataPlansUpdate: service = " << service_path;
- const Service *service = service_manager_.GetService(service_path);
+ const Service *service = service_manager_->GetService(service_path);
if (service == NULL) {
DLOG(WARNING) << "RequestDataPlansUpdate: unknown service: "
<< service_path;
@@ -64,6 +68,12 @@ bool CashewServer::IsAlive(DBus::Error& error) { // NOLINT
return true;
}
+// Service Manager methods
+
+void CashewServer::EmitDataPlansUpdate(const Service& service) {
+ EmitDataPlansUpdateSignal(service);
+}
+
// Private methods
void CashewServer::EmitDataPlansUpdateSignal(const Service& service) {
« no previous file with comments | « src/cashew_server.h ('k') | src/data_plan.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698