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

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

Issue 10539169: Prototype version of the first-run dialog for Windows 8 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed some of reviewer's remarks. Created 8 years, 6 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 714 matching lines...) Expand 10 before | Expand all | Expand 10 after
725 int BrowserOptionsHandler::StatusStringIdForState( 725 int BrowserOptionsHandler::StatusStringIdForState(
726 ShellIntegration::DefaultWebClientState state) { 726 ShellIntegration::DefaultWebClientState state) {
727 if (state == ShellIntegration::IS_DEFAULT_WEB_CLIENT) 727 if (state == ShellIntegration::IS_DEFAULT_WEB_CLIENT)
728 return IDS_OPTIONS_DEFAULTBROWSER_DEFAULT; 728 return IDS_OPTIONS_DEFAULTBROWSER_DEFAULT;
729 if (state == ShellIntegration::NOT_DEFAULT_WEB_CLIENT) 729 if (state == ShellIntegration::NOT_DEFAULT_WEB_CLIENT)
730 return IDS_OPTIONS_DEFAULTBROWSER_NOTDEFAULT; 730 return IDS_OPTIONS_DEFAULTBROWSER_NOTDEFAULT;
731 return IDS_OPTIONS_DEFAULTBROWSER_UNKNOWN; 731 return IDS_OPTIONS_DEFAULTBROWSER_UNKNOWN;
732 } 732 }
733 733
734 void BrowserOptionsHandler::SetDefaultWebClientUIState( 734 void BrowserOptionsHandler::SetDefaultWebClientUIState(
735 ShellIntegration::DefaultWebClientUIState state) { 735 ShellIntegration::DefaultWebClientUIState state,
736 ShellIntegration::SetDefaultWebClientResult unused_result) {
736 int status_string_id; 737 int status_string_id;
737 if (state == ShellIntegration::STATE_IS_DEFAULT) 738 if (state == ShellIntegration::STATE_IS_DEFAULT)
738 status_string_id = IDS_OPTIONS_DEFAULTBROWSER_DEFAULT; 739 status_string_id = IDS_OPTIONS_DEFAULTBROWSER_DEFAULT;
739 else if (state == ShellIntegration::STATE_NOT_DEFAULT) 740 else if (state == ShellIntegration::STATE_NOT_DEFAULT)
740 status_string_id = IDS_OPTIONS_DEFAULTBROWSER_NOTDEFAULT; 741 status_string_id = IDS_OPTIONS_DEFAULTBROWSER_NOTDEFAULT;
741 else if (state == ShellIntegration::STATE_UNKNOWN) 742 else if (state == ShellIntegration::STATE_UNKNOWN)
742 status_string_id = IDS_OPTIONS_DEFAULTBROWSER_UNKNOWN; 743 status_string_id = IDS_OPTIONS_DEFAULTBROWSER_UNKNOWN;
743 else 744 else
744 return; // Still processing. 745 return; // Still processing.
745 746
(...skipping 670 matching lines...) Expand 10 before | Expand all | Expand 10 after
1416 } 1417 }
1417 1418
1418 void BrowserOptionsHandler::SetupSSLConfigSettings() { 1419 void BrowserOptionsHandler::SetupSSLConfigSettings() {
1419 base::FundamentalValue checked(rev_checking_enabled_.GetValue()); 1420 base::FundamentalValue checked(rev_checking_enabled_.GetValue());
1420 base::FundamentalValue disabled(rev_checking_enabled_.IsManaged()); 1421 base::FundamentalValue disabled(rev_checking_enabled_.IsManaged());
1421 web_ui()->CallJavascriptFunction( 1422 web_ui()->CallJavascriptFunction(
1422 "BrowserOptions.setCheckRevocationCheckboxState", checked, disabled); 1423 "BrowserOptions.setCheckRevocationCheckboxState", checked, disabled);
1423 } 1424 }
1424 1425
1425 } // namespace options2 1426 } // namespace options2
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698