chrome/browser/ui/webui/options2/browser_options_handler2.cc - Issue 10353017: Unlaunch the HIDDEN mode.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/webui/options2/browser_options_handler2.cc

Issue 10353017: Unlaunch the HIDDEN mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Addressed @sky's comment; fixed tests Created 8 years, 8 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:

Index: chrome/browser/ui/webui/options2/browser_options_handler2.cc

diff --git a/chrome/browser/ui/webui/options2/browser_options_handler2.cc b/chrome/browser/ui/webui/options2/browser_options_handler2.cc

index 8c7ba968c65cef72534fd821e91aab843847fb4d..2594805893f5b8985d68e8390aeba0b4a44d7a06 100644

--- a/chrome/browser/ui/webui/options2/browser_options_handler2.cc

+++ b/chrome/browser/ui/webui/options2/browser_options_handler2.cc

@@ -901,8 +901,8 @@ void BrowserOptionsHandler::ToggleAutoLaunch(const ListValue* args) {

void BrowserOptionsHandler::GetInstantFieldTrialStatus(const ListValue* args) {

Profile* profile = Profile::FromWebUI(web_ui());

base::FundamentalValue enabled(

- InstantFieldTrial::IsInstantExperiment(profile) &&

- !InstantFieldTrial::IsHiddenExperiment(profile));

+ !profile->GetPrefs()->GetBoolean(prefs::kInstantEnabled) &&

+ InstantFieldTrial::GetMode(profile) == InstantFieldTrial::INSTANT);

web_ui()->CallJavascriptFunction("BrowserOptions.setInstantFieldTrialStatus",

enabled);

}