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

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

Issue 10689116: Cleanup: better session restore UI. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased. Created 8 years, 5 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_handler.h" 5 #include "chrome/browser/ui/webui/options2/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 { "profilesManage", IDS_PROFILES_MANAGE_BUTTON_LABEL }, 232 { "profilesManage", IDS_PROFILES_MANAGE_BUTTON_LABEL },
233 { "proxiesLabel", IDS_OPTIONS_PROXIES_LABEL }, 233 { "proxiesLabel", IDS_OPTIONS_PROXIES_LABEL },
234 { "safeBrowsingEnableProtection", 234 { "safeBrowsingEnableProtection",
235 IDS_OPTIONS_SAFEBROWSING_ENABLEPROTECTION }, 235 IDS_OPTIONS_SAFEBROWSING_ENABLEPROTECTION },
236 { "sectionTitleAppearance", IDS_APPEARANCE_GROUP_NAME }, 236 { "sectionTitleAppearance", IDS_APPEARANCE_GROUP_NAME },
237 { "sectionTitleDefaultBrowser", IDS_OPTIONS_DEFAULTBROWSER_GROUP_NAME }, 237 { "sectionTitleDefaultBrowser", IDS_OPTIONS_DEFAULTBROWSER_GROUP_NAME },
238 { "sectionTitleUsers", IDS_PROFILES_OPTIONS_GROUP_NAME }, 238 { "sectionTitleUsers", IDS_PROFILES_OPTIONS_GROUP_NAME },
239 { "sectionTitleSearch", IDS_OPTIONS_DEFAULTSEARCH_GROUP_NAME }, 239 { "sectionTitleSearch", IDS_OPTIONS_DEFAULTSEARCH_GROUP_NAME },
240 { "sectionTitleStartup", IDS_OPTIONS_STARTUP_GROUP_NAME }, 240 { "sectionTitleStartup", IDS_OPTIONS_STARTUP_GROUP_NAME },
241 { "sectionTitleSync", IDS_SYNC_OPTIONS_GROUP_NAME }, 241 { "sectionTitleSync", IDS_SYNC_OPTIONS_GROUP_NAME },
242 { "sessionRestoreOverlayMessage", IDS_SESSION_RESTORE_OVERLAY_MESSAGE },
243 { "sessionRestoreOverlayTitle", IDS_SESSION_RESTORE_OVERLAY_TITLE },
244 { "spellingConfirmMessage", IDS_CONTENT_CONTEXT_SPELLING_BUBBLE_TEXT }, 242 { "spellingConfirmMessage", IDS_CONTENT_CONTEXT_SPELLING_BUBBLE_TEXT },
245 { "spellingConfirmTitle", IDS_CONTENT_CONTEXT_SPELLING_ASK_GOOGLE }, 243 { "spellingConfirmTitle", IDS_CONTENT_CONTEXT_SPELLING_ASK_GOOGLE },
246 { "spellingConfirmEnable", IDS_CONTENT_CONTEXT_SPELLING_BUBBLE_ENABLE }, 244 { "spellingConfirmEnable", IDS_CONTENT_CONTEXT_SPELLING_BUBBLE_ENABLE },
247 { "spellingConfirmDisable", IDS_CONTENT_CONTEXT_SPELLING_BUBBLE_DISABLE }, 245 { "spellingConfirmDisable", IDS_CONTENT_CONTEXT_SPELLING_BUBBLE_DISABLE },
248 { "spellingPref", IDS_OPTIONS_SPELLING_PREF }, 246 { "spellingPref", IDS_OPTIONS_SPELLING_PREF },
249 { "startupRestoreLastSession", IDS_OPTIONS_STARTUP_RESTORE_LAST_SESSION }, 247 { "startupRestoreLastSession", IDS_OPTIONS_STARTUP_RESTORE_LAST_SESSION },
250 { "settingsTitle", IDS_SETTINGS_TITLE }, 248 { "settingsTitle", IDS_SETTINGS_TITLE },
251 { "showAdvancedSettings", IDS_SETTINGS_SHOW_ADVANCED_SETTINGS }, 249 { "showAdvancedSettings", IDS_SETTINGS_SHOW_ADVANCED_SETTINGS },
252 { "sslCheckRevocation", IDS_OPTIONS_SSL_CHECKREVOCATION }, 250 { "sslCheckRevocation", IDS_OPTIONS_SSL_CHECKREVOCATION },
253 { "startupSetPages", IDS_OPTIONS2_STARTUP_SET_PAGES }, 251 { "startupSetPages", IDS_OPTIONS2_STARTUP_SET_PAGES },
(...skipping 1191 matching lines...) Expand 10 before | Expand all | Expand 10 after
1445 } 1443 }
1446 1444
1447 void BrowserOptionsHandler::SetupSSLConfigSettings() { 1445 void BrowserOptionsHandler::SetupSSLConfigSettings() {
1448 base::FundamentalValue checked(rev_checking_enabled_.GetValue()); 1446 base::FundamentalValue checked(rev_checking_enabled_.GetValue());
1449 base::FundamentalValue disabled(rev_checking_enabled_.IsManaged()); 1447 base::FundamentalValue disabled(rev_checking_enabled_.IsManaged());
1450 web_ui()->CallJavascriptFunction( 1448 web_ui()->CallJavascriptFunction(
1451 "BrowserOptions.setCheckRevocationCheckboxState", checked, disabled); 1449 "BrowserOptions.setCheckRevocationCheckboxState", checked, disabled);
1452 } 1450 }
1453 1451
1454 } // namespace options2 1452 } // namespace options2
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698