Now command line flag does not beat Policy

chrome/browser/chrome_browser_main.cc

Index: chrome/browser/chrome_browser_main.cc
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index 75518a2f8d575ae0d583242e59e70fe639e4749f..f9f02840373e61a9604236c4a9abd033c5f9de65 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -1143,9 +1143,16 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
 #endif
 
   if (parsed_command_line().HasSwitch(switches::kMakeDefaultBrowser)) {
-    return ShellIntegration::SetAsDefaultBrowser() ?
+    bool is_managed = g_browser_process->local_state()->IsManagedPreference(
+      prefs::kDefaultBrowserSettingEnabled);
+    if (!is_managed ||
+      g_browser_process->local_state()->GetBoolean(
+      prefs::kDefaultBrowserSettingEnabled)) {
+      return ShellIntegration::SetAsDefaultBrowser() ?
         static_cast<int>(content::RESULT_CODE_NORMAL_EXIT) :
         static_cast<int>(chrome::RESULT_CODE_SHELL_INTEGRATION_FAILED);
+    }
+    return static_cast<int>(chrome::RESULT_CODE_SHELL_INTEGRATION_FAILED);

[pastarmovj, 2015/03/18 16:02:17]

Any chance you can add a new error result code here to distinguish between
failure reasons. Especially if this error is then propagated to the user in one
way or another even if only through logging.

   }
 
 #if defined(USE_AURA)