chrome/browser/ui/webui/options/browser_options_handler.cc - Issue 12090062: Enable profile switching for standalone App Launcher via the Settings App.

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/options/browser_options_handler.cc

Issue 12090062: Enable profile switching for standalone App Launcher via the Settings App. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: disable tests on aura Created 7 years, 10 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/views/app_list/app_list_controller_win.cc ('k') | chrome/browser/ui/webui/options/manage_profile_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options/browser_options_handler.cc

diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc

index 1e61c1ad120cd28566b989441b30aa7be223ff34..e8baece81c8c8b512448dd04ef77ac218b78d9a9 100644

--- a/chrome/browser/ui/webui/options/browser_options_handler.cc

+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc

@@ -238,6 +238,9 @@ void BrowserOptionsHandler::GetLocalizedValues(DictionaryValue* values) {

{ "profilesDeleteSingle", IDS_PROFILES_DELETE_SINGLE_BUTTON_LABEL },

{ "profilesListItemCurrent", IDS_PROFILES_LIST_ITEM_CURRENT },

{ "profilesManage", IDS_PROFILES_MANAGE_BUTTON_LABEL },

+#if defined(ENABLE_SETTINGS_APP)

+ { "profilesAppListSwitch", IDS_SETTINGS_APP_PROFILES_SWITCH_BUTTON_LABEL },

+#endif

{ "proxiesLabel", IDS_OPTIONS_PROXIES_LABEL },

{ "safeBrowsingEnableProtection",

IDS_OPTIONS_SAFEBROWSING_ENABLEPROTECTION },