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

Unified Diff: chrome/browser/ui/webui/settings/settings_default_browser_handler.cc

Issue 1657933003: Fixes the interactive default browser UX for policy setting (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix merge issue Created 4 years, 10 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 | « chrome/browser/ui/webui/settings/settings_default_browser_handler.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/settings/settings_default_browser_handler.cc
diff --git a/chrome/browser/ui/webui/settings/settings_default_browser_handler.cc b/chrome/browser/ui/webui/settings/settings_default_browser_handler.cc
index c976f61d475cce9849bae6fe673a7ece095925c9..b48ba0e55699f4e51ba9d1f2844261e7879dfc63 100644
--- a/chrome/browser/ui/webui/settings/settings_default_browser_handler.cc
+++ b/chrome/browser/ui/webui/settings/settings_default_browser_handler.cc
@@ -13,8 +13,9 @@
namespace settings {
DefaultBrowserHandler::DefaultBrowserHandler(content::WebUI* webui)
- : default_browser_worker_(
- new shell_integration::DefaultBrowserWorker(this)) {
+ : default_browser_worker_(new shell_integration::DefaultBrowserWorker(
+ this,
+ /*delete_observer=*/false)) {
default_browser_policy_.Init(
prefs::kDefaultBrowserSettingEnabled, g_browser_process->local_state(),
base::Bind(&DefaultBrowserHandler::RequestDefaultBrowserState,
@@ -60,10 +61,6 @@ void DefaultBrowserHandler::SetDefaultWebClientUIState(
is_default, can_be_default);
}
-bool DefaultBrowserHandler::IsInteractiveSetDefaultPermitted() {
- return true;
-}
-
void DefaultBrowserHandler::OnSetAsDefaultConcluded(bool succeeded) {
base::FundamentalValue success(succeeded);
web_ui()->CallJavascriptFunction("Settings.setAsDefaultConcluded", success);
« no previous file with comments | « chrome/browser/ui/webui/settings/settings_default_browser_handler.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698