Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(310)

Side by Side Diff: chrome/browser/ui/webui/options/browser_options_handler.cc

Issue 11968034: Enable profile switching for standalone App Launcher via the Settings App. (Closed) Base URL: git://nomatter.syd/chromium/src.git@master
Patch Set: respond to comments Created 7 years, 11 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/webui/options/browser_options_handler.h" 5 #include "chrome/browser/ui/webui/options/browser_options_handler.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 { "passwordGenerationEnabledDescription", 232 { "passwordGenerationEnabledDescription",
233 IDS_OPTIONS_PASSWORD_GENERATION_ENABLED_LABEL }, 233 IDS_OPTIONS_PASSWORD_GENERATION_ENABLED_LABEL },
234 { "privacyClearDataButton", IDS_OPTIONS_PRIVACY_CLEAR_DATA_BUTTON }, 234 { "privacyClearDataButton", IDS_OPTIONS_PRIVACY_CLEAR_DATA_BUTTON },
235 { "privacyContentSettingsButton", 235 { "privacyContentSettingsButton",
236 IDS_OPTIONS_PRIVACY_CONTENT_SETTINGS_BUTTON }, 236 IDS_OPTIONS_PRIVACY_CONTENT_SETTINGS_BUTTON },
237 { "profilesCreate", IDS_PROFILES_CREATE_BUTTON_LABEL }, 237 { "profilesCreate", IDS_PROFILES_CREATE_BUTTON_LABEL },
238 { "profilesDelete", IDS_PROFILES_DELETE_BUTTON_LABEL }, 238 { "profilesDelete", IDS_PROFILES_DELETE_BUTTON_LABEL },
239 { "profilesDeleteSingle", IDS_PROFILES_DELETE_SINGLE_BUTTON_LABEL }, 239 { "profilesDeleteSingle", IDS_PROFILES_DELETE_SINGLE_BUTTON_LABEL },
240 { "profilesListItemCurrent", IDS_PROFILES_LIST_ITEM_CURRENT }, 240 { "profilesListItemCurrent", IDS_PROFILES_LIST_ITEM_CURRENT },
241 { "profilesManage", IDS_PROFILES_MANAGE_BUTTON_LABEL }, 241 { "profilesManage", IDS_PROFILES_MANAGE_BUTTON_LABEL },
242 #if defined(ENABLE_SETTINGS_APP)
243 { "profilesAppListSwitch", IDS_SETTINGS_APP_PROFILES_SWITCH_BUTTON_LABEL },
244 #endif
242 { "proxiesLabel", IDS_OPTIONS_PROXIES_LABEL }, 245 { "proxiesLabel", IDS_OPTIONS_PROXIES_LABEL },
243 { "safeBrowsingEnableProtection", 246 { "safeBrowsingEnableProtection",
244 IDS_OPTIONS_SAFEBROWSING_ENABLEPROTECTION }, 247 IDS_OPTIONS_SAFEBROWSING_ENABLEPROTECTION },
245 { "sectionTitleAppearance", IDS_APPEARANCE_GROUP_NAME }, 248 { "sectionTitleAppearance", IDS_APPEARANCE_GROUP_NAME },
246 { "sectionTitleDefaultBrowser", IDS_OPTIONS_DEFAULTBROWSER_GROUP_NAME }, 249 { "sectionTitleDefaultBrowser", IDS_OPTIONS_DEFAULTBROWSER_GROUP_NAME },
247 { "sectionTitleUsers", IDS_PROFILES_OPTIONS_GROUP_NAME }, 250 { "sectionTitleUsers", IDS_PROFILES_OPTIONS_GROUP_NAME },
248 { "sectionTitleSearch", IDS_OPTIONS_DEFAULTSEARCH_GROUP_NAME }, 251 { "sectionTitleSearch", IDS_OPTIONS_DEFAULTSEARCH_GROUP_NAME },
249 { "sectionTitleStartup", IDS_OPTIONS_STARTUP_GROUP_NAME }, 252 { "sectionTitleStartup", IDS_OPTIONS_STARTUP_GROUP_NAME },
250 { "sectionTitleSync", IDS_SYNC_OPTIONS_GROUP_NAME }, 253 { "sectionTitleSync", IDS_SYNC_OPTIONS_GROUP_NAME },
251 { "spellingConfirmMessage", IDS_CONTENT_CONTEXT_SPELLING_BUBBLE_TEXT }, 254 { "spellingConfirmMessage", IDS_CONTENT_CONTEXT_SPELLING_BUBBLE_TEXT },
(...skipping 1157 matching lines...) Expand 10 before | Expand all | Expand 10 after
1409 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); 1412 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
1410 } 1413 }
1411 StringValue label(label_str); 1414 StringValue label(label_str);
1412 1415
1413 web_ui()->CallJavascriptFunction( 1416 web_ui()->CallJavascriptFunction(
1414 "BrowserOptions.setupProxySettingsSection", disabled, label); 1417 "BrowserOptions.setupProxySettingsSection", disabled, label);
1415 #endif // !defined(OS_CHROMEOS) 1418 #endif // !defined(OS_CHROMEOS)
1416 } 1419 }
1417 1420
1418 } // namespace options 1421 } // namespace options
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698