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

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

Issue 518063002: Settings to control Add Person and Browse as Guest. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Completely move prefs Created 6 years, 3 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/bind.h" 10 #include "base/bind.h"
(...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after
285 { "manageLanguages", IDS_OPTIONS_TRANSLATE_MANAGE_LANGUAGES }, 285 { "manageLanguages", IDS_OPTIONS_TRANSLATE_MANAGE_LANGUAGES },
286 { "managePasswords", IDS_OPTIONS_PASSWORDS_MANAGE_PASSWORDS_LINK }, 286 { "managePasswords", IDS_OPTIONS_PASSWORDS_MANAGE_PASSWORDS_LINK },
287 { "networkPredictionEnabledDescription", 287 { "networkPredictionEnabledDescription",
288 IDS_NETWORK_PREDICTION_ENABLED_DESCRIPTION }, 288 IDS_NETWORK_PREDICTION_ENABLED_DESCRIPTION },
289 { "passwordsAndAutofillGroupName", 289 { "passwordsAndAutofillGroupName",
290 IDS_OPTIONS_PASSWORDS_AND_FORMS_GROUP_NAME }, 290 IDS_OPTIONS_PASSWORDS_AND_FORMS_GROUP_NAME },
291 { "passwordManagerEnabled", IDS_OPTIONS_PASSWORD_MANAGER_ENABLE }, 291 { "passwordManagerEnabled", IDS_OPTIONS_PASSWORD_MANAGER_ENABLE },
292 { "privacyClearDataButton", IDS_OPTIONS_PRIVACY_CLEAR_DATA_BUTTON }, 292 { "privacyClearDataButton", IDS_OPTIONS_PRIVACY_CLEAR_DATA_BUTTON },
293 { "privacyContentSettingsButton", 293 { "privacyContentSettingsButton",
294 IDS_OPTIONS_PRIVACY_CONTENT_SETTINGS_BUTTON }, 294 IDS_OPTIONS_PRIVACY_CONTENT_SETTINGS_BUTTON },
295 { "profileAddPersonEnable", IDS_PROFILE_ADD_PERSON_ENABLE },
296 { "profileBrowserGuestEnable", IDS_PROFILE_BROWSER_GUEST_ENABLE },
295 { "profilesCreate", using_new_profiles_ui ? 297 { "profilesCreate", using_new_profiles_ui ?
296 IDS_NEW_PROFILES_CREATE_BUTTON_LABEL : 298 IDS_NEW_PROFILES_CREATE_BUTTON_LABEL :
297 IDS_PROFILES_CREATE_BUTTON_LABEL }, 299 IDS_PROFILES_CREATE_BUTTON_LABEL },
298 { "profilesDelete", using_new_profiles_ui ? 300 { "profilesDelete", using_new_profiles_ui ?
299 IDS_NEW_PROFILES_DELETE_BUTTON_LABEL : 301 IDS_NEW_PROFILES_DELETE_BUTTON_LABEL :
300 IDS_PROFILES_DELETE_BUTTON_LABEL }, 302 IDS_PROFILES_DELETE_BUTTON_LABEL },
301 { "profilesDeleteSingle", using_new_profiles_ui ? 303 { "profilesDeleteSingle", using_new_profiles_ui ?
302 IDS_NEW_PROFILES_DELETE_SINGLE_BUTTON_LABEL : 304 IDS_NEW_PROFILES_DELETE_SINGLE_BUTTON_LABEL :
303 IDS_PROFILES_DELETE_SINGLE_BUTTON_LABEL }, 305 IDS_PROFILES_DELETE_SINGLE_BUTTON_LABEL },
304 { "profilesListItemCurrent", IDS_PROFILES_LIST_ITEM_CURRENT }, 306 { "profilesListItemCurrent", IDS_PROFILES_LIST_ITEM_CURRENT },
(...skipping 1556 matching lines...) Expand 10 before | Expand all | Expand 10 after
1861 extension = extensions::GetExtensionOverridingProxy( 1863 extension = extensions::GetExtensionOverridingProxy(
1862 Profile::FromWebUI(web_ui())); 1864 Profile::FromWebUI(web_ui()));
1863 AppendExtensionData("proxy", extension, &extension_controlled); 1865 AppendExtensionData("proxy", extension, &extension_controlled);
1864 1866
1865 web_ui()->CallJavascriptFunction("BrowserOptions.toggleExtensionIndicators", 1867 web_ui()->CallJavascriptFunction("BrowserOptions.toggleExtensionIndicators",
1866 extension_controlled); 1868 extension_controlled);
1867 #endif // defined(OS_WIN) 1869 #endif // defined(OS_WIN)
1868 } 1870 }
1869 1871
1870 } // namespace options 1872 } // namespace options
OLDNEW
« no previous file with comments | « chrome/browser/resources/user_manager/user_manager.js ('k') | chrome/browser/ui/webui/options/core_options_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698