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

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

Issue 9583025: Revert 124583 (See crbug.com/114259) Original info for r124583 is: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 9 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
« no previous file with comments | « chrome/browser/ui/browser_init.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 { "sectionTitleSync", IDS_SYNC_OPTIONS_GROUP_NAME }, 243 { "sectionTitleSync", IDS_SYNC_OPTIONS_GROUP_NAME },
244 { "sessionRestoreOverlayMessage", IDS_SESSION_RESTORE_OVERLAY_MESSAGE }, 244 { "sessionRestoreOverlayMessage", IDS_SESSION_RESTORE_OVERLAY_MESSAGE },
245 { "sessionRestoreOverlayTitle", IDS_SESSION_RESTORE_OVERLAY_TITLE }, 245 { "sessionRestoreOverlayTitle", IDS_SESSION_RESTORE_OVERLAY_TITLE },
246 { "startupRestoreLastSession", IDS_OPTIONS_STARTUP_RESTORE_LAST_SESSION }, 246 { "startupRestoreLastSession", IDS_OPTIONS_STARTUP_RESTORE_LAST_SESSION },
247 { "settingsTitle", IDS_SETTINGS_TITLE }, 247 { "settingsTitle", IDS_SETTINGS_TITLE },
248 { "showAdvancedSettings", IDS_SETTINGS_SHOW_ADVANCED_SETTINGS }, 248 { "showAdvancedSettings", IDS_SETTINGS_SHOW_ADVANCED_SETTINGS },
249 { "spellingPref", IDS_OPTIONS_SPELLING_PREF }, 249 { "spellingPref", IDS_OPTIONS_SPELLING_PREF },
250 { "sslCheckRevocation", IDS_OPTIONS_SSL_CHECKREVOCATION }, 250 { "sslCheckRevocation", IDS_OPTIONS_SSL_CHECKREVOCATION },
251 { "sslGroupDescription", IDS_OPTIONS_SSL_GROUP_DESCRIPTION }, 251 { "sslGroupDescription", IDS_OPTIONS_SSL_GROUP_DESCRIPTION },
252 { "startupSetPages", IDS_OPTIONS2_STARTUP_SET_PAGES }, 252 { "startupSetPages", IDS_OPTIONS2_STARTUP_SET_PAGES },
253 { "startupShowHomePage", IDS_OPTIONS2_STARTUP_SHOW_HOME_PAGE },
253 { "startupShowNewTab", IDS_OPTIONS2_STARTUP_SHOW_NEWTAB }, 254 { "startupShowNewTab", IDS_OPTIONS2_STARTUP_SHOW_NEWTAB },
254 { "startupShowLastSession", IDS_OPTIONS_STARTUP_SHOW_LAST_SESSION }, 255 { "startupShowLastSession", IDS_OPTIONS_STARTUP_SHOW_LAST_SESSION },
255 { "startupShowPages", IDS_OPTIONS2_STARTUP_SHOW_PAGES }, 256 { "startupShowPages", IDS_OPTIONS2_STARTUP_SHOW_PAGES },
256 { "suggestPref", IDS_OPTIONS_SUGGEST_PREF }, 257 { "suggestPref", IDS_OPTIONS_SUGGEST_PREF },
257 { "syncButtonTextInProgress", IDS_SYNC_NTP_SETUP_IN_PROGRESS }, 258 { "syncButtonTextInProgress", IDS_SYNC_NTP_SETUP_IN_PROGRESS },
258 { "syncButtonTextStop", IDS_SYNC_STOP_SYNCING_BUTTON_LABEL }, 259 { "syncButtonTextStop", IDS_SYNC_STOP_SYNCING_BUTTON_LABEL },
259 { "themesGallery", IDS_THEMES_GALLERY_BUTTON }, 260 { "themesGallery", IDS_THEMES_GALLERY_BUTTON },
260 { "themesGalleryURL", IDS_THEMES_GALLERY_URL }, 261 { "themesGalleryURL", IDS_THEMES_GALLERY_URL },
261 { "tabsToLinksPref", IDS_OPTIONS_TABS_TO_LINKS_PREF }, 262 { "tabsToLinksPref", IDS_OPTIONS_TABS_TO_LINKS_PREF },
262 { "toolbarGroupName", IDS_OPTIONS2_TOOLBAR_GROUP_NAME }, 263 { "toolbarGroupName", IDS_OPTIONS2_TOOLBAR_GROUP_NAME },
(...skipping 1182 matching lines...) Expand 10 before | Expand all | Expand 10 after
1445 } 1446 }
1446 1447
1447 void BrowserOptionsHandler::SetupSSLConfigSettings() { 1448 void BrowserOptionsHandler::SetupSSLConfigSettings() {
1448 base::FundamentalValue checked(rev_checking_enabled_.GetValue()); 1449 base::FundamentalValue checked(rev_checking_enabled_.GetValue());
1449 base::FundamentalValue disabled(rev_checking_enabled_.IsManaged()); 1450 base::FundamentalValue disabled(rev_checking_enabled_.IsManaged());
1450 web_ui()->CallJavascriptFunction( 1451 web_ui()->CallJavascriptFunction(
1451 "BrowserOptions.setCheckRevocationCheckboxState", checked, disabled); 1452 "BrowserOptions.setCheckRevocationCheckboxState", checked, disabled);
1452 } 1453 }
1453 1454
1454 } // namespace options2 1455 } // namespace options2
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser_init.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698