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

Side by Side Diff: chrome/browser/ui/webui/options2/browser_options_handler2.cc

Issue 10222017: Make password generation switched by a preference in chrome settings rather than a command line fla… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 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 | Annotate | Revision Log
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/options2/browser_options_handler2.h" 5 #include "chrome/browser/ui/webui/options2/browser_options_handler2.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 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 IDS_OPTIONS_LANGUAGE_AND_SPELLCHECK_BUTTON }, 204 IDS_OPTIONS_LANGUAGE_AND_SPELLCHECK_BUTTON },
205 #endif 205 #endif
206 { "linkDoctorPref", IDS_OPTIONS_LINKDOCTOR_PREF }, 206 { "linkDoctorPref", IDS_OPTIONS_LINKDOCTOR_PREF },
207 { "manageAutofillSettings", IDS_OPTIONS_MANAGE_AUTOFILL_SETTINGS_LINK }, 207 { "manageAutofillSettings", IDS_OPTIONS_MANAGE_AUTOFILL_SETTINGS_LINK },
208 { "managePasswords", IDS_OPTIONS_PASSWORDS_MANAGE_PASSWORDS_LINK }, 208 { "managePasswords", IDS_OPTIONS_PASSWORDS_MANAGE_PASSWORDS_LINK },
209 { "networkPredictionEnabledDescription", 209 { "networkPredictionEnabledDescription",
210 IDS_NETWORK_PREDICTION_ENABLED_DESCRIPTION }, 210 IDS_NETWORK_PREDICTION_ENABLED_DESCRIPTION },
211 { "passwordsAndAutofillGroupName", 211 { "passwordsAndAutofillGroupName",
212 IDS_OPTIONS_PASSWORDS_AND_FORMS_GROUP_NAME }, 212 IDS_OPTIONS_PASSWORDS_AND_FORMS_GROUP_NAME },
213 { "passwordManagerEnabled", IDS_OPTIONS_PASSWORD_MANAGER_ENABLE }, 213 { "passwordManagerEnabled", IDS_OPTIONS_PASSWORD_MANAGER_ENABLE },
214 { "passwordGenerationEnabledDescription",
215 IDS_OPTIONS_PASSWORD_GENERATION_ENABLED_LABEL },
214 { "privacyClearDataButton", IDS_OPTIONS_PRIVACY_CLEAR_DATA_BUTTON }, 216 { "privacyClearDataButton", IDS_OPTIONS_PRIVACY_CLEAR_DATA_BUTTON },
215 { "privacyContentSettingsButton", 217 { "privacyContentSettingsButton",
216 IDS_OPTIONS_PRIVACY_CONTENT_SETTINGS_BUTTON }, 218 IDS_OPTIONS_PRIVACY_CONTENT_SETTINGS_BUTTON },
217 { "profilesCreate", IDS_PROFILES_CREATE_BUTTON_LABEL }, 219 { "profilesCreate", IDS_PROFILES_CREATE_BUTTON_LABEL },
218 { "profilesDelete", IDS_PROFILES_DELETE_BUTTON_LABEL }, 220 { "profilesDelete", IDS_PROFILES_DELETE_BUTTON_LABEL },
219 { "profilesDeleteSingle", IDS_PROFILES_DELETE_SINGLE_BUTTON_LABEL }, 221 { "profilesDeleteSingle", IDS_PROFILES_DELETE_SINGLE_BUTTON_LABEL },
220 { "profilesListItemCurrent", IDS_PROFILES_LIST_ITEM_CURRENT }, 222 { "profilesListItemCurrent", IDS_PROFILES_LIST_ITEM_CURRENT },
221 { "profilesManage", IDS_PROFILES_MANAGE_BUTTON_LABEL }, 223 { "profilesManage", IDS_PROFILES_MANAGE_BUTTON_LABEL },
222 { "proxiesLabel", IDS_OPTIONS_PROXIES_LABEL }, 224 { "proxiesLabel", IDS_OPTIONS_PROXIES_LABEL },
223 { "safeBrowsingEnableProtection", 225 { "safeBrowsingEnableProtection",
(...skipping 1188 matching lines...) Expand 10 before | Expand all | Expand 10 after
1412 } 1414 }
1413 1415
1414 void BrowserOptionsHandler::SetupSSLConfigSettings() { 1416 void BrowserOptionsHandler::SetupSSLConfigSettings() {
1415 base::FundamentalValue checked(rev_checking_enabled_.GetValue()); 1417 base::FundamentalValue checked(rev_checking_enabled_.GetValue());
1416 base::FundamentalValue disabled(rev_checking_enabled_.IsManaged()); 1418 base::FundamentalValue disabled(rev_checking_enabled_.IsManaged());
1417 web_ui()->CallJavascriptFunction( 1419 web_ui()->CallJavascriptFunction(
1418 "BrowserOptions.setCheckRevocationCheckboxState", checked, disabled); 1420 "BrowserOptions.setCheckRevocationCheckboxState", checked, disabled);
1419 } 1421 }
1420 1422
1421 } // namespace options2 1423 } // namespace options2
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698