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

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

Issue 1749813002: Fixes hidden "Set Default Browser" button when group policy is enabled (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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/options/browser_options_handler.cc ('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 8d1923e6c3930aab9861b0a9c263e2043b78fec3..fa60315cef011f384bdf521480571179946638fd 100644
--- a/chrome/browser/ui/webui/settings/settings_default_browser_handler.cc
+++ b/chrome/browser/ui/webui/settings/settings_default_browser_handler.cc
@@ -12,6 +12,14 @@
namespace settings {
+namespace {
+
+bool IsDisabledByPolicy(const BooleanPrefMember& pref) {
+ return pref.IsManaged() && !pref.GetValue();
+}
+
+} // namespace
+
DefaultBrowserHandler::DefaultBrowserHandler(content::WebUI* webui)
: default_browser_worker_(new shell_integration::DefaultBrowserWorker(
this,
@@ -53,7 +61,7 @@ void DefaultBrowserHandler::SetDefaultWebClientUIState(
shell_integration::STATE_IS_DEFAULT);
base::FundamentalValue can_be_default(
state != shell_integration::STATE_UNKNOWN &&
- !default_browser_policy_.IsManaged() &&
+ !IsDisabledByPolicy(default_browser_policy_) &&
shell_integration::CanSetAsDefaultBrowser() !=
shell_integration::SET_DEFAULT_NOT_ALLOWED);
@@ -67,7 +75,7 @@ void DefaultBrowserHandler::RequestDefaultBrowserState(
}
void DefaultBrowserHandler::SetAsDefaultBrowser(const base::ListValue* args) {
- CHECK(!default_browser_policy_.IsManaged());
+ CHECK(!IsDisabledByPolicy(default_browser_policy_));
default_browser_worker_->StartSetAsDefault();
« no previous file with comments | « chrome/browser/ui/webui/options/browser_options_handler.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698