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

Unified Diff: chrome/browser/ui/webui/options/browser_options_handler.cc

Issue 490523004: [Mac] Do not show the 'Make X the default browser' button on Canary. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/options/browser_options_handler.cc
diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc
index 50289d3b1b62d28035859569b14ddf0acfdef3a8..bc111f0bc31534ee5d939fa921c45a85838ab2d8 100644
--- a/chrome/browser/ui/webui/options/browser_options_handler.cc
+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
@@ -169,9 +169,7 @@ BrowserOptionsHandler::BrowserOptionsHandler()
cloud_print_mdns_ui_enabled_(false),
signin_observer_(this),
weak_ptr_factory_(this) {
-#if !defined(OS_MACOSX)
default_browser_worker_ = new ShellIntegration::DefaultBrowserWorker(this);
-#endif
#if defined(ENABLE_SERVICE_DISCOVERY)
cloud_print_mdns_ui_enabled_ = true;
@@ -1035,21 +1033,7 @@ bool BrowserOptionsHandler::ShouldAllowAdvancedSettings() {
}
void BrowserOptionsHandler::UpdateDefaultBrowserState() {
-#if defined(OS_MACOSX)
- ShellIntegration::DefaultWebClientState state =
- ShellIntegration::GetDefaultBrowser();
- int status_string_id;
- if (state == ShellIntegration::IS_DEFAULT)
- status_string_id = IDS_OPTIONS_DEFAULTBROWSER_DEFAULT;
- else if (state == ShellIntegration::NOT_DEFAULT)
- status_string_id = IDS_OPTIONS_DEFAULTBROWSER_NOTDEFAULT;
- else
- status_string_id = IDS_OPTIONS_DEFAULTBROWSER_UNKNOWN;
-
- SetDefaultBrowserUIString(status_string_id);
-#else
default_browser_worker_->StartCheckIsDefault();
-#endif
}
void BrowserOptionsHandler::BecomeDefaultBrowser(const base::ListValue* args) {
@@ -1059,13 +1043,8 @@ void BrowserOptionsHandler::BecomeDefaultBrowser(const base::ListValue* args) {
return;
content::RecordAction(UserMetricsAction("Options_SetAsDefaultBrowser"));
-#if defined(OS_MACOSX)
- if (ShellIntegration::SetAsDefaultBrowser())
- UpdateDefaultBrowserState();
-#else
default_browser_worker_->StartSetAsDefault();
// Callback takes care of updating UI.
-#endif
// If the user attempted to make Chrome the default browser, then he/she
// arguably wants to be notified when that changes.
« 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