Disable easter egg on enterprised enrolled devices

chrome/browser/chrome_content_browser_client.cc

Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index e821dfbdd0562b6c8f74c43ffb63da994919718d..a20ef923520669f0ec81825aa3e8831793da2201 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -154,6 +154,7 @@
 #include "chrome/browser/chromeos/fileapi/file_system_backend.h"
 #include "chrome/browser/chromeos/fileapi/mtp_file_system_backend_delegate.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
+#include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/system/input_device_settings.h"
 #include "chromeos/chromeos_switches.h"
 #include "components/user_manager/user_manager.h"
@@ -1412,6 +1413,12 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
           ChromeSigninClientFactory::GetForProfile(profile);
       if (signin_client && signin_client->IsSigninProcess(process->GetID()))
         command_line->AppendSwitch(switches::kSigninProcess);
+#else

[Andrew T Wilson (Slow), 2015/03/10 15:31:57]

nit: I prefer a positive check (#if defined(OS_CHROMEOS)) to a negative check.
Any chance that you could swap the order of these two clauses and make this a
#if defined(OS_CHROMEOS))?

[edwardjung, 2015/03/10 18:12:28]

Done.

+      // Enterprise enrolled check to disable the easter egg.
+      bool isEnterpriseManaged = g_browser_process->platform_part()->

[Andrew T Wilson (Slow), 2015/03/10 15:31:58]

nit: bool isEnterpriseManaged -> const bool is_enterprise_managed

[edwardjung, 2015/03/10 18:12:28]

Done.

+              browser_policy_connector_chromeos()->IsEnterpriseManaged();
+      if (isEnterpriseManaged)
+        command_line->AppendSwitch(switches::kDisableDinosaurEasterEgg);
 #endif
     }