chrome/browser/ui/webui/options2/content_settings_handler2.cc - Issue 10134026: Remove browser from web intents UI code

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/content_settings_handler2.cc

Issue 10134026: Remove browser from web intents UI code (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Browser test compilation 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/content_settings_handler2.cc

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

index 1492385175df56babdcc4cb15a15079664ef298d..7498f62bd2459d08bb742079dc0ec2c05759ee23 100644

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

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

@@ -302,8 +302,9 @@ void ContentSettingsHandler::GetLocalizedValues(

RegisterTitle(localized_strings, "mouselock",

IDS_MOUSE_LOCK_TAB_LABEL);

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

localized_strings->SetBoolean("enable_web_intents",

- web_intents::IsWebIntentsEnabled());

+ web_intents::IsWebIntentsEnabled(profile));

// TODO(marja): clean up the options UI after the decision on the session

// restore changes has stabilized.

localized_strings->SetBoolean(

« no previous file with comments | « chrome/browser/ui/views/web_intent_picker_views.cc ('k') | no next file » | no next file with comments »