summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/browser/about_flags.cc4
-rw-r--r--chrome/browser/chromeos/net/wake_on_wifi_manager.cc28
-rw-r--r--chrome/browser/chromeos/net/wake_on_wifi_manager.h12
-rw-r--r--chrome/browser/chromeos/preferences.cc19
-rw-r--r--chrome/browser/chromeos/preferences.h2
-rw-r--r--chrome/browser/extensions/api/settings_private/prefs_util.cc4
-rw-r--r--chrome/browser/resources/options/browser_options.html4
-rw-r--r--chrome/browser/resources/settings/privacy_page/privacy_page.html2
-rw-r--r--chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc2
-rw-r--r--chrome/common/pref_names.cc7
-rw-r--r--chrome/common/pref_names.h2
-rw-r--r--chromeos/chromeos_switches.cc5
-rw-r--r--chromeos/chromeos_switches.h2
-rw-r--r--tools/metrics/actions/actions.xml20
-rw-r--r--tools/metrics/histograms/histograms.xml1
15 files changed, 71 insertions, 43 deletions
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 2be65ea..bc66e45 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -1692,11 +1692,11 @@ const FeatureEntry kFeatureEntries[] = {
IDS_FLAGS_MEMORY_PRESSURE_THRESHOLD_DESCRIPTION,
kOsCrOS,
MULTI_VALUE_TYPE(kMemoryPressureThresholdChoices)},
- {"wake-on-packets",
+ {"wake-on-wifi-packet",
IDS_FLAGS_WAKE_ON_PACKETS_NAME,
IDS_FLAGS_WAKE_ON_PACKETS_DESCRIPTION,
kOsCrOSOwnerOnly,
- SINGLE_VALUE_TYPE(chromeos::switches::kWakeOnPackets)},
+ SINGLE_VALUE_TYPE(chromeos::switches::kWakeOnWifiPacket)},
#endif // OS_CHROMEOS
{"enable-tab-audio-muting",
IDS_FLAGS_ENABLE_TAB_AUDIO_MUTING_NAME,
diff --git a/chrome/browser/chromeos/net/wake_on_wifi_manager.cc b/chrome/browser/chromeos/net/wake_on_wifi_manager.cc
index 37e6924..3fb3bba 100644
--- a/chrome/browser/chromeos/net/wake_on_wifi_manager.cc
+++ b/chrome/browser/chromeos/net/wake_on_wifi_manager.cc
@@ -36,22 +36,22 @@ namespace chromeos {
namespace {
-const char kWakeOnNone[] = "none";
-const char kWakeOnPacket[] = "packet";
-const char kWakeOnSsid[] = "ssid";
-const char kWakeOnPacketAndSsid[] = "packet_and_ssid";
+const char kWakeOnWifiNone[] = "none";
+const char kWakeOnWifiPacket[] = "packet";
+const char kWakeOnWifiDarkConnect[] = "darkconnect";
+const char kWakeOnWifiPacketAndDarkConnect[] = "packet_and_darkconnect";
std::string WakeOnWifiFeatureToString(
WakeOnWifiManager::WakeOnWifiFeature feature) {
switch (feature) {
- case WakeOnWifiManager::WAKE_ON_NONE:
- return kWakeOnNone;
- case WakeOnWifiManager::WAKE_ON_PACKET:
- return kWakeOnPacket;
- case WakeOnWifiManager::WAKE_ON_SSID:
- return kWakeOnSsid;
- case WakeOnWifiManager::WAKE_ON_PACKET_AND_SSID:
- return kWakeOnPacketAndSsid;
+ case WakeOnWifiManager::WAKE_ON_WIFI_NONE:
+ return kWakeOnWifiNone;
+ case WakeOnWifiManager::WAKE_ON_WIFI_PACKET:
+ return kWakeOnWifiPacket;
+ case WakeOnWifiManager::WAKE_ON_WIFI_DARKCONNECT:
+ return kWakeOnWifiDarkConnect;
+ case WakeOnWifiManager::WAKE_ON_WIFI_PACKET_AND_DARKCONNECT:
+ return kWakeOnWifiPacketAndDarkConnect;
case WakeOnWifiManager::INVALID:
return std::string();
case WakeOnWifiManager::NOT_SUPPORTED:
@@ -64,7 +64,7 @@ std::string WakeOnWifiFeatureToString(
}
bool IsWakeOnPacketEnabled(WakeOnWifiManager::WakeOnWifiFeature feature) {
- return feature & WakeOnWifiManager::WAKE_ON_PACKET;
+ return feature & WakeOnWifiManager::WAKE_ON_WIFI_PACKET;
}
// Weak pointer. This class is owned by ChromeBrowserMainPartsChromeos.
@@ -204,7 +204,7 @@ void WakeOnWifiManager::OnPreferenceChanged(
if (current_feature_ == NOT_SUPPORTED)
return;
if (!switches::WakeOnWifiEnabled())
- feature = WAKE_ON_NONE;
+ feature = WAKE_ON_WIFI_NONE;
if (feature == current_feature_)
return;
diff --git a/chrome/browser/chromeos/net/wake_on_wifi_manager.h b/chrome/browser/chromeos/net/wake_on_wifi_manager.h
index 86f2175..7d88ef4 100644
--- a/chrome/browser/chromeos/net/wake_on_wifi_manager.h
+++ b/chrome/browser/chromeos/net/wake_on_wifi_manager.h
@@ -32,12 +32,12 @@ class WakeOnWifiManager : public content::NotificationObserver,
public NetworkStateHandlerObserver {
public:
enum WakeOnWifiFeature {
- WAKE_ON_NONE = 0x00,
- WAKE_ON_PACKET = 0x01,
- WAKE_ON_SSID = 0x02,
- WAKE_ON_PACKET_AND_SSID = 0x03,
- NOT_SUPPORTED = 0x04,
- INVALID = 0x08,
+ WAKE_ON_WIFI_NONE = 0x00,
+ WAKE_ON_WIFI_PACKET = 0x01,
+ WAKE_ON_WIFI_DARKCONNECT = 0x02,
+ WAKE_ON_WIFI_PACKET_AND_DARKCONNECT = 0x03,
+ NOT_SUPPORTED = 0x04,
+ INVALID = 0x08,
};
static WakeOnWifiManager* Get();
diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc
index b6ed2db..d32f60a 100644
--- a/chrome/browser/chromeos/preferences.cc
+++ b/chrome/browser/chromeos/preferences.cc
@@ -248,7 +248,7 @@ void Preferences::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
// We don't sync wake-on-wifi related prefs because they are device specific.
- registry->RegisterBooleanPref(prefs::kWakeOnWifiSsid, true);
+ registry->RegisterBooleanPref(prefs::kWakeOnWifiDarkConnect, true);
// 3G first-time usage promo will be shown at least once.
registry->RegisterBooleanPref(prefs::kShow3gPromoNotification, true);
@@ -323,7 +323,8 @@ void Preferences::InitUserPrefs(syncable_prefs::PrefServiceSyncable* prefs) {
xkb_auto_repeat_interval_pref_.Init(
prefs::kLanguageXkbAutoRepeatInterval, prefs, callback);
- wake_on_wifi_ssid_.Init(prefs::kWakeOnWifiSsid, prefs, callback);
+ wake_on_wifi_darkconnect_.Init(prefs::kWakeOnWifiDarkConnect, prefs,
+ callback);
pref_change_registrar_.Init(prefs);
pref_change_registrar_.Add(prefs::kResolveTimezoneByGeolocation, callback);
@@ -585,13 +586,15 @@ void Preferences::ApplyPreferences(ApplyReason reason,
}
if (user_is_primary_ && (reason != REASON_PREF_CHANGED ||
- pref_name == prefs::kWakeOnWifiSsid)) {
- int features = wake_on_wifi_ssid_.GetValue() ?
- WakeOnWifiManager::WAKE_ON_SSID : WakeOnWifiManager::WAKE_ON_NONE;
- // The flag enables wake on packets but doesn't update a preference.
+ pref_name == prefs::kWakeOnWifiDarkConnect)) {
+ int features = wake_on_wifi_darkconnect_.GetValue()
+ ? WakeOnWifiManager::WAKE_ON_WIFI_DARKCONNECT
+ : WakeOnWifiManager::WAKE_ON_WIFI_NONE;
+ // The flag enables wake on WiFi packet feature but doesn't update a
+ // preference.
if (base::CommandLine::ForCurrentProcess()->
- HasSwitch(switches::kWakeOnPackets)) {
- features |= WakeOnWifiManager::WAKE_ON_PACKET;
+ HasSwitch(switches::kWakeOnWifiPacket)) {
+ features |= WakeOnWifiManager::WAKE_ON_WIFI_PACKET;
}
WakeOnWifiManager::Get()->OnPreferenceChanged(
static_cast<WakeOnWifiManager::WakeOnWifiFeature>(features));
diff --git a/chrome/browser/chromeos/preferences.h b/chrome/browser/chromeos/preferences.h
index f3df661..0c983d4 100644
--- a/chrome/browser/chromeos/preferences.h
+++ b/chrome/browser/chromeos/preferences.h
@@ -143,7 +143,7 @@ class Preferences : public syncable_prefs::PrefServiceSyncableObserver,
IntegerPrefMember xkb_auto_repeat_delay_pref_;
IntegerPrefMember xkb_auto_repeat_interval_pref_;
- BooleanPrefMember wake_on_wifi_ssid_;
+ BooleanPrefMember wake_on_wifi_darkconnect_;
PrefChangeRegistrar pref_change_registrar_;
diff --git a/chrome/browser/extensions/api/settings_private/prefs_util.cc b/chrome/browser/extensions/api/settings_private/prefs_util.cc
index a175fe5..b2c8a3c 100644
--- a/chrome/browser/extensions/api/settings_private/prefs_util.cc
+++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc
@@ -172,7 +172,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelistedKeys() {
settings_private::PrefType::PREF_TYPE_BOOLEAN;
(*s_whitelist)["cros.device.attestation_for_content_protection_enabled"] =
settings_private::PrefType::PREF_TYPE_BOOLEAN;
- (*s_whitelist)["settings.internet.wake_on_wifi_ssid"] =
+ (*s_whitelist)["settings.internet.wake_on_wifi_darkconnect"] =
settings_private::PrefType::PREF_TYPE_BOOLEAN;
#else
(*s_whitelist)["intl.accept_languages"] =
@@ -462,7 +462,7 @@ bool PrefsUtil::IsPrefOwnerControlled(const std::string& pref_name) {
}
bool PrefsUtil::IsPrefPrimaryUserControlled(const std::string& pref_name) {
- if (pref_name == prefs::kWakeOnWifiSsid) {
+ if (pref_name == prefs::kWakeOnWifiDarkConnect) {
user_manager::UserManager* user_manager = user_manager::UserManager::Get();
const user_manager::User* user =
chromeos::ProfileHelper::Get()->GetUserByProfile(profile_);
diff --git a/chrome/browser/resources/options/browser_options.html b/chrome/browser/resources/options/browser_options.html
index b36fd4e..6b2577d 100644
--- a/chrome/browser/resources/options/browser_options.html
+++ b/chrome/browser/resources/options/browser_options.html
@@ -503,12 +503,12 @@
<label>
<input id="wake-on-wifi-checkbox" type="checkbox"
metric="Options_WakeOnWifiSsid"
- pref="settings.internet.wake_on_wifi_ssid">
+ pref="settings.internet.wake_on_wifi_darkconnect">
<span>
<span i18n-content="wakeOnWifiLabel"></span>
<span id="wake-on-wifi-indicator"
class="controlled-setting-indicator"
- pref="settings.internet.wake_on_wifi_ssid"></span>
+ pref="settings.internet.wake_on_wifi_darkconnect"></span>
</span>
</label>
</div>
diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/chrome/browser/resources/settings/privacy_page/privacy_page.html
index b1b149b..4eaabd0 100644
--- a/chrome/browser/resources/settings/privacy_page/privacy_page.html
+++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html
@@ -62,7 +62,7 @@
i18n-values="label:enableContentProtectionAttestation">
</settings-checkbox>
<settings-checkbox
- pref="{{prefs.settings.internet.wake_on_wifi_ssid}}"
+ pref="{{prefs.settings.internet.wake_on_wifi_darkconnect}}"
i18n-values="label:wakeOnWifi">
</settings-checkbox>
</if>
diff --git a/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc
index d3e613d..91f53821 100644
--- a/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc
@@ -46,7 +46,7 @@ const char* kNonPrivilegedSettings[] = {
// List of settings that should only be changeable by the primary user.
const char* kPrimaryUserSettings[] = {
- prefs::kWakeOnWifiSsid,
+ prefs::kWakeOnWifiDarkConnect,
};
// Returns true if |pref| can be controlled (e.g. by policy or owner).
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
index e01b2bd..63a8c94 100644
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -790,8 +790,11 @@ const char kFileSystemProviderMounted[] = "file_system_provider.mounted";
// A boolean pref set to true if the virtual keyboard should be enabled.
const char kTouchVirtualKeyboardEnabled[] = "ui.touch_virtual_keyboard_enabled";
-// A boolean pref that controls whether wake on SSID is enabled.
-const char kWakeOnWifiSsid[] = "settings.internet.wake_on_wifi_ssid";
+// A boolean pref that controls whether the dark connect feature is enabled.
+// The dark connect feature allows a Chrome OS device to periodically wake
+// from suspend in a low-power state to maintain WiFi connectivity.
+const char kWakeOnWifiDarkConnect[] =
+ "settings.internet.wake_on_wifi_darkconnect";
// This is the policy CaptivePortalAuthenticationIgnoresProxy that allows to
// open captive portal authentication pages in a separate window under
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
index 938505e..e5955e0 100644
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -262,7 +262,7 @@ extern const char kTimeOnOobe[];
extern const char kCurrentWallpaperAppName[];
extern const char kFileSystemProviderMounted[];
extern const char kTouchVirtualKeyboardEnabled[];
-extern const char kWakeOnWifiSsid[];
+extern const char kWakeOnWifiDarkConnect[];
extern const char kCaptivePortalAuthenticationIgnoresProxy[];
extern const char kForceMaximizeOnFirstRun[];
extern const char kPlatformKeys[];
diff --git a/chromeos/chromeos_switches.cc b/chromeos/chromeos_switches.cc
index d523f09..c897806 100644
--- a/chromeos/chromeos_switches.cc
+++ b/chromeos/chromeos_switches.cc
@@ -289,8 +289,9 @@ const char kForceFirstRunUI[] = "force-first-run-ui";
// Enables testing for auto update UI.
const char kTestAutoUpdateUI[] = "test-auto-update-ui";
-// Enables waking the device based on the receipt of some network packets.
-const char kWakeOnPackets[] = "wake-on-packets";
+// Enables wake on wifi packet feature, which wakes the device on the receipt
+// of network packets from whitelisted sources.
+const char kWakeOnWifiPacket[] = "wake-on-wifi-packet";
// Screenshot testing: specifies the directory where the golden screenshots are
// stored.
diff --git a/chromeos/chromeos_switches.h b/chromeos/chromeos_switches.h
index 544950f..1244a6b 100644
--- a/chromeos/chromeos_switches.h
+++ b/chromeos/chromeos_switches.h
@@ -99,7 +99,7 @@ CHROMEOS_EXPORT extern const char kSmsTestMessages[];
CHROMEOS_EXPORT extern const char kStubCrosSettings[];
CHROMEOS_EXPORT extern const char kSystemDevMode[];
CHROMEOS_EXPORT extern const char kTestAutoUpdateUI[];
-CHROMEOS_EXPORT extern const char kWakeOnPackets[];
+CHROMEOS_EXPORT extern const char kWakeOnWifiPacket[];
CHROMEOS_EXPORT extern const char kDisableCaptivePortalBypassProxy[];
CHROMEOS_EXPORT extern const char kDisableTimeZoneTrackingOption[];
CHROMEOS_EXPORT extern const char kDisableDataSaverPrompt[];
diff --git a/tools/metrics/actions/actions.xml b/tools/metrics/actions/actions.xml
index cbf3cbb..3ce2f05 100644
--- a/tools/metrics/actions/actions.xml
+++ b/tools/metrics/actions/actions.xml
@@ -10493,14 +10493,34 @@ should be able to be added at any place in this file.
<description>Please enter the description of this user action.</description>
</action>
+<action name="Options_WakeOnWifiDarkConnect_Disable">
+ <owner>michaelpg@chromium.org</owner>
+ <description>
+ Settings: Disable Wake on Wi-Fi Dark Connect feature
+ </description>
+</action>
+
+<action name="Options_WakeOnWifiDarkConnect_Enable">
+ <owner>michaelpg@chromium.org</owner>
+ <description>Settings: Enable Wake on Wi-Fi Dark Connect feature</description>
+</action>
+
<action name="Options_WakeOnWifiSsid_Disable">
<owner>michaelpg@chromium.org</owner>
<description>Settings: Disable Wake on Wi-Fi SSID</description>
+ <obsolete>
+ Deprecated 10/2015 in issue 1412993003 and replaced by
+ Options_WakeOnWifiDarkConnect_Disable.
+ </obsolete>
</action>
<action name="Options_WakeOnWifiSsid_Enable">
<owner>michaelpg@chromium.org</owner>
<description>Settings: Enable Wake on Wi-Fi SSID</description>
+ <obsolete>
+ Deprecated 10/2015 in issue 1412993003 and replaced by
+ Options_WakeOnWifiDarkConnect_Enable.
+ </obsolete>
</action>
<action name="Options_WhitelistedUser_Add">
diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
index dd54238..6324dbc 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -65076,6 +65076,7 @@ To add a new entry, add it with any value and run test to compute valid value.
<int value="455698038"
label="disable-gesture-requirement-for-media-playback"/>
<int value="458410433" label="disable-views-rect-based-targeting"/>
+ <int value="460475728" label="wake-on-wifi-packet"/>
<int value="466248382" label="disable-push-api-background-mode"/>
<int value="474743272" label="material-design-ink-drop"/>
<int value="494733611" label="disable-drop-sync-credential"/>
generated by cgit v1.1 at 2024-05-30 08:36:09 +0000