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 1d362a634301b4178ce2a3d3f6b57a56dcf1a639..056f116055675f790fae25c2b05c0b6d2d8518e0 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -1158,9 +1158,16 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
 #endif  // defined(OS_WIN)
 
   if (parsed_command_line().HasSwitch(switches::kMakeDefaultBrowser)) {
+    bool is_managed = g_browser_process->local_state()->IsManagedPreference(
+      prefs::kDefaultBrowserSettingEnabled);

[pastarmovj, 2015/03/20 10:57:04]

nit: indentation.

[peletskyi, 2015/03/20 11:02:02]

Done.

+    if (is_managed && !g_browser_process->local_state()->GetBoolean(
+      prefs::kDefaultBrowserSettingEnabled)) {

[pastarmovj, 2015/03/20 10:57:04]

nit: indentation.

[peletskyi, 2015/03/20 11:02:02]

Done.

+      return static_cast<int>(chrome::RESULT_CODE_ACTION_DISALLOWED_BY_POLICY);
+    }
+
     return ShellIntegration::SetAsDefaultBrowser() ?
-        static_cast<int>(content::RESULT_CODE_NORMAL_EXIT) :
-        static_cast<int>(chrome::RESULT_CODE_SHELL_INTEGRATION_FAILED);
+      static_cast<int>(content::RESULT_CODE_NORMAL_EXIT) :
+      static_cast<int>(chrome::RESULT_CODE_SHELL_INTEGRATION_FAILED);
   }
 
 #if defined(USE_AURA)