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

Unified Diff: chrome/browser/chromeos/mobile/mobile_activator.h

Issue 23441025: Clean up NetworkState members (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/mobile/mobile_activator.h
diff --git a/chrome/browser/chromeos/mobile/mobile_activator.h b/chrome/browser/chromeos/mobile/mobile_activator.h
index 19bf15863cd93a1d90563b77999d4546f5fae4bc..2e86bf4dd769a3123ae9bacf4ee6466b8f75fcd7 100644
--- a/chrome/browser/chromeos/mobile/mobile_activator.h
+++ b/chrome/browser/chromeos/mobile/mobile_activator.h
@@ -144,8 +144,14 @@ class MobileActivator
virtual void DefaultNetworkChanged(const NetworkState* network) OVERRIDE;
virtual void NetworkPropertiesUpdated(const NetworkState* network) OVERRIDE;
- // Continue activation after inital setup (config load).
+ // Continue activation after inital setup (config load). Makes an
+ // asynchronous call to NetworkConfigurationHandler::GetProperties.
void ContinueActivation();
+ void GetPropertiesAndContinueActivation(
+ const std::string& service_path,
+ const base::DictionaryValue& properties);
+ void GetPropertiesFailure(const std::string& error_name,
+ scoped_ptr<base::DictionaryValue> error_data);
// Handles the signal that the payment portal has finished loading.
void HandlePortalLoaded(bool success);
// Handles the signal that the user has finished with the portal.
@@ -289,6 +295,7 @@ class MobileActivator
base::Time cellular_plan_payment_time_;
ObserverList<Observer> observers_;
+ base::WeakPtrFactory<MobileActivator> weak_ptr_factory_;
DISALLOW_COPY_AND_ASSIGN(MobileActivator);
};
« no previous file with comments | « chrome/browser/automation/testing_automation_provider_chromeos.cc ('k') | chrome/browser/chromeos/mobile/mobile_activator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698