Commit ced48bd2 authored by Eric Noyau's avatar Eric Noyau Committed by Commit Bot

Removing autoReload flag from experimental

Bug: 
Change-Id: I2eb56189944a490992b861a114ffc58abc207a05
Reviewed-on: https://chromium-review.googlesource.com/600208Reviewed-by: default avatarElly Fong-Jones <ellyjones@chromium.org>
Commit-Queue: Eric Noyau <noyau@chromium.org>
Cr-Commit-Position: refs/heads/master@{#491721}
parent 9a32bd29
...@@ -160,14 +160,6 @@ void AppendSwitchesFromExperimentalSettings(base::CommandLine* command_line) { ...@@ -160,14 +160,6 @@ void AppendSwitchesFromExperimentalSettings(base::CommandLine* command_line) {
"MAP * " + base::SysNSStringToUTF8(webPageReplayProxy)); "MAP * " + base::SysNSStringToUTF8(webPageReplayProxy));
} }
NSString* autoReloadEnabledValue =
[defaults stringForKey:@"AutoReloadEnabled"];
if ([autoReloadEnabledValue isEqualToString:@"Enabled"]) {
command_line->AppendSwitch(switches::kEnableOfflineAutoReload);
} else if ([autoReloadEnabledValue isEqualToString:@"Disabled"]) {
command_line->AppendSwitch(switches::kDisableOfflineAutoReload);
}
// Populate command line flags from ReaderModeEnabled. // Populate command line flags from ReaderModeEnabled.
if ([defaults boolForKey:@"ReaderModeEnabled"]) { if ([defaults boolForKey:@"ReaderModeEnabled"]) {
command_line->AppendSwitch(switches::kEnableReaderModeToolbarIcon); command_line->AppendSwitch(switches::kEnableReaderModeToolbarIcon);
......
...@@ -27,9 +27,6 @@ const char kDisableIOSPasswordGeneration[] = "disable-ios-password-generation"; ...@@ -27,9 +27,6 @@ const char kDisableIOSPasswordGeneration[] = "disable-ios-password-generation";
const char kDisableIOSPasswordSuggestions[] = const char kDisableIOSPasswordSuggestions[] =
"disable-ios-password-suggestions"; "disable-ios-password-suggestions";
// Disable auto-reload of error pages if offline.
const char kDisableOfflineAutoReload[] = "disable-offline-auto-reload";
// Disables the tab strip auto scroll new tabs. // Disables the tab strip auto scroll new tabs.
const char kDisableTabStripAutoScrollNewTabs[] = const char kDisableTabStripAutoScrollNewTabs[] =
"disable-tab-strip-autoscroll-new-tabs"; "disable-tab-strip-autoscroll-new-tabs";
...@@ -65,9 +62,6 @@ const char kEnableIOSHandoffToOtherDevices[] = ...@@ -65,9 +62,6 @@ const char kEnableIOSHandoffToOtherDevices[] =
// Enable password generation for iOS. // Enable password generation for iOS.
const char kEnableIOSPasswordGeneration[] = "enable-ios-password-generation"; const char kEnableIOSPasswordGeneration[] = "enable-ios-password-generation";
// Enable auto-reload of error pages if offline.
const char kEnableOfflineAutoReload[] = "enable-offline-auto-reload";
// Enables context-sensitive reader mode button in the toolbar. // Enables context-sensitive reader mode button in the toolbar.
const char kEnableReaderModeToolbarIcon[] = "enable-reader-mode-toolbar-icon"; const char kEnableReaderModeToolbarIcon[] = "enable-reader-mode-toolbar-icon";
......
...@@ -14,7 +14,6 @@ extern const char kDisableIOSFeatures[]; ...@@ -14,7 +14,6 @@ extern const char kDisableIOSFeatures[];
extern const char kDisableIOSPasswordGeneration[]; extern const char kDisableIOSPasswordGeneration[];
extern const char kDisableIOSPasswordSuggestions[]; extern const char kDisableIOSPasswordSuggestions[];
extern const char kDisableNTPFavicons[]; extern const char kDisableNTPFavicons[];
extern const char kDisableOfflineAutoReload[];
extern const char kDisableTabStripAutoScrollNewTabs[]; extern const char kDisableTabStripAutoScrollNewTabs[];
extern const char kDisableIOSPhysicalWeb[]; extern const char kDisableIOSPhysicalWeb[];
extern const char kDisableSuggestionsUI[]; extern const char kDisableSuggestionsUI[];
...@@ -27,7 +26,6 @@ extern const char kEnableIOSFeatures[]; ...@@ -27,7 +26,6 @@ extern const char kEnableIOSFeatures[];
extern const char kEnableIOSHandoffToOtherDevices[]; extern const char kEnableIOSHandoffToOtherDevices[];
extern const char kEnableIOSPasswordGeneration[]; extern const char kEnableIOSPasswordGeneration[];
extern const char kEnableNTPFavicons[]; extern const char kEnableNTPFavicons[];
extern const char kEnableOfflineAutoReload[];
extern const char kEnableReaderModeToolbarIcon[]; extern const char kEnableReaderModeToolbarIcon[];
extern const char kEnableSpotlightActions[]; extern const char kEnableSpotlightActions[];
extern const char kEnableIOSPhysicalWeb[]; extern const char kEnableIOSPhysicalWeb[];
......
...@@ -96,14 +96,8 @@ bool IsAlertOnBackgroundUploadEnabled() { ...@@ -96,14 +96,8 @@ bool IsAlertOnBackgroundUploadEnabled() {
} }
bool IsAutoReloadEnabled() { bool IsAutoReloadEnabled() {
std::string group_name = base::FieldTrialList::FindFullName("IOSAutoReload"); // TODO(crbug.com/752084): Remove this function and its associated code.
base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
if (command_line->HasSwitch(switches::kEnableOfflineAutoReload))
return true;
if (command_line->HasSwitch(switches::kDisableOfflineAutoReload))
return false; return false;
return base::StartsWith(group_name, "Enabled",
base::CompareCase::INSENSITIVE_ASCII);
} }
bool IsLRUSnapshotCacheEnabled() { bool IsLRUSnapshotCacheEnabled() {
......
...@@ -232,28 +232,6 @@ ...@@ -232,28 +232,6 @@
<key>DefaultValue</key> <key>DefaultValue</key>
<false/> <false/>
</dict> </dict>
<dict>
<key>Type</key>
<string>PSMultiValueSpecifier</string>
<key>Title</key>
<string>Auto Reload Enabled</string>
<key>Key</key>
<string>AutoReloadEnabled</string>
<key>DefaultValue</key>
<string></string>
<key>Values</key>
<array>
<string></string>
<string>Enabled</string>
<string>Disabled</string>
</array>
<key>Titles</key>
<array>
<string>Default</string>
<string>Enabled</string>
<string>Disabled</string>
</array>
</dict>
<dict> <dict>
<key>Type</key> <key>Type</key>
<string>PSMultiValueSpecifier</string> <string>PSMultiValueSpecifier</string>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment