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

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

Issue 597913004: Condition the ShowManageSSLCertificates button on operating system. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
« no previous file with comments | « no previous file | 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/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 683 matching lines...) Expand 10 before | Expand all | Expand 10 after
694 base::Bind(&BrowserOptionsHandler::HandleAutoOpenButton, 694 base::Bind(&BrowserOptionsHandler::HandleAutoOpenButton,
695 base::Unretained(this))); 695 base::Unretained(this)));
696 web_ui()->RegisterMessageCallback( 696 web_ui()->RegisterMessageCallback(
697 "defaultFontSizeAction", 697 "defaultFontSizeAction",
698 base::Bind(&BrowserOptionsHandler::HandleDefaultFontSize, 698 base::Bind(&BrowserOptionsHandler::HandleDefaultFontSize,
699 base::Unretained(this))); 699 base::Unretained(this)));
700 web_ui()->RegisterMessageCallback( 700 web_ui()->RegisterMessageCallback(
701 "defaultZoomFactorAction", 701 "defaultZoomFactorAction",
702 base::Bind(&BrowserOptionsHandler::HandleDefaultZoomFactor, 702 base::Bind(&BrowserOptionsHandler::HandleDefaultZoomFactor,
703 base::Unretained(this))); 703 base::Unretained(this)));
704 #if !defined(USE_NSS) && !defined(USE_OPENSSL) 704 #if defined(OS_WIN) || defined(OS_MACOSX)
Dan Beam 2014/09/24 18:41:08 why not add a USE_BORINGSSL?
davidben 2014/09/24 18:50:15 The problem isn't OpenSSL -> BoringSSL (all refere
705 web_ui()->RegisterMessageCallback( 705 web_ui()->RegisterMessageCallback(
706 "showManageSSLCertificates", 706 "showManageSSLCertificates",
707 base::Bind(&BrowserOptionsHandler::ShowManageSSLCertificates, 707 base::Bind(&BrowserOptionsHandler::ShowManageSSLCertificates,
708 base::Unretained(this))); 708 base::Unretained(this)));
709 #endif 709 #endif
710 #if defined(OS_CHROMEOS) 710 #if defined(OS_CHROMEOS)
711 web_ui()->RegisterMessageCallback( 711 web_ui()->RegisterMessageCallback(
712 "openWallpaperManager", 712 "openWallpaperManager",
713 base::Bind(&BrowserOptionsHandler::HandleOpenWallpaperManager, 713 base::Bind(&BrowserOptionsHandler::HandleOpenWallpaperManager,
714 base::Unretained(this))); 714 base::Unretained(this)));
(...skipping 855 matching lines...) Expand 10 before | Expand all | Expand 10 after
1570 1570
1571 #if !defined(OS_CHROMEOS) 1571 #if !defined(OS_CHROMEOS)
1572 void BrowserOptionsHandler::ShowNetworkProxySettings( 1572 void BrowserOptionsHandler::ShowNetworkProxySettings(
1573 const base::ListValue* args) { 1573 const base::ListValue* args) {
1574 content::RecordAction(UserMetricsAction("Options_ShowProxySettings")); 1574 content::RecordAction(UserMetricsAction("Options_ShowProxySettings"));
1575 AdvancedOptionsUtilities::ShowNetworkProxySettings( 1575 AdvancedOptionsUtilities::ShowNetworkProxySettings(
1576 web_ui()->GetWebContents()); 1576 web_ui()->GetWebContents());
1577 } 1577 }
1578 #endif 1578 #endif
1579 1579
1580 #if !defined(USE_NSS) && !defined(USE_OPENSSL) 1580 #if defined(OS_WIN) || defined(OS_MACOSX)
1581 void BrowserOptionsHandler::ShowManageSSLCertificates( 1581 void BrowserOptionsHandler::ShowManageSSLCertificates(
1582 const base::ListValue* args) { 1582 const base::ListValue* args) {
1583 content::RecordAction(UserMetricsAction("Options_ManageSSLCertificates")); 1583 content::RecordAction(UserMetricsAction("Options_ManageSSLCertificates"));
1584 AdvancedOptionsUtilities::ShowManageSSLCertificates( 1584 AdvancedOptionsUtilities::ShowManageSSLCertificates(
1585 web_ui()->GetWebContents()); 1585 web_ui()->GetWebContents());
1586 } 1586 }
1587 #endif 1587 #endif
1588 1588
1589 #if defined(ENABLE_SERVICE_DISCOVERY) 1589 #if defined(ENABLE_SERVICE_DISCOVERY)
1590 1590
(...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after
1925 1925
1926 void BrowserOptionsHandler::SetMetricsReportingCheckbox(bool checked, 1926 void BrowserOptionsHandler::SetMetricsReportingCheckbox(bool checked,
1927 bool disabled) { 1927 bool disabled) {
1928 web_ui()->CallJavascriptFunction( 1928 web_ui()->CallJavascriptFunction(
1929 "BrowserOptions.setMetricsReportingCheckboxState", 1929 "BrowserOptions.setMetricsReportingCheckboxState",
1930 base::FundamentalValue(checked), 1930 base::FundamentalValue(checked),
1931 base::FundamentalValue(disabled)); 1931 base::FundamentalValue(disabled));
1932 } 1932 }
1933 1933
1934 } // namespace options 1934 } // namespace options
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698