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

Unified Diff: chrome/browser/chromeos/system/ash_system_tray_delegate.cc

Issue 23532065: Add NetworkState::RequiresActivation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/system/ash_system_tray_delegate.cc
diff --git a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
index c3fe71f26358a98dd765ca2da0146368fa14e05d..9b26ee86e23b96a07bec9bc8d3aa3e2cf0c3c4d6 100644
--- a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
+++ b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
@@ -96,6 +96,7 @@
#include "chromeos/ime/input_method_manager.h"
#include "chromeos/ime/xkeyboard.h"
#include "chromeos/login/login_state.h"
+#include "chromeos/network/network_activation_handler.h"
#include "chromeos/network/network_event_log.h"
#include "chromeos/network/network_state.h"
#include "chromeos/network/network_state_handler.h"
@@ -268,7 +269,7 @@ void HandleUnconfiguredNetwork(const std::string& service_path,
}
if (network->type() == flimflam::kTypeCellular) {
- if (network->activation_state() != flimflam::kActivationStateActivated) {
+ if (NetworkActivationHandler::NetworkRequiresActivation(network)) {
ash::network_connect::ActivateCellular(service_path);
return;
}
« no previous file with comments | « no previous file | chromeos/network/network_activation_handler.h » ('j') | chromeos/network/network_activation_handler.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698