Index: chrome/browser/chromeos/net/wake_on_wifi_manager.cc |
diff --git a/chrome/browser/chromeos/net/wake_on_wifi_manager.cc b/chrome/browser/chromeos/net/wake_on_wifi_manager.cc |
index 6233784a9e3d945c232a270325f87cee62430773..bc77158b9f4a17dd6ac49e477808b2502c7b019a 100644 |
--- a/chrome/browser/chromeos/net/wake_on_wifi_manager.cc |
+++ b/chrome/browser/chromeos/net/wake_on_wifi_manager.cc |
@@ -17,6 +17,7 @@ |
#include "chrome/browser/profiles/profile.h" |
#include "chrome/browser/services/gcm/gcm_profile_service.h" |
#include "chrome/browser/services/gcm/gcm_profile_service_factory.h" |
+#include "chromeos/chromeos_switches.h" |
#include "chromeos/login/login_state.h" |
#include "chromeos/network/device_state.h" |
#include "chromeos/network/network_device_handler.h" |
@@ -172,6 +173,8 @@ WakeOnWifiManager::~WakeOnWifiManager() { |
void WakeOnWifiManager::OnPreferenceChanged( |
WakeOnWifiManager::WakeOnWifiFeature feature) { |
DCHECK_CURRENTLY_ON(content::BrowserThread::UI); |
+ if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableWakeOnWifi)) |
+ return; |
stevenjb
2014/12/17 22:22:54
In cases like this where we might be changing the
michaelpg
2014/12/22 22:23:18
I don't think we would change the polarity of it -
stevenjb (google-dont-use)
2014/12/22 23:30:22
We generally just change the executable on the bra
|
if (feature == current_feature_) |
return; |