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 f7c3c618d8c8ecbcf10cbc566c92548eba06dde1..6958512baf3307de48b24e6da12488d1713755bc 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"
@@ -1406,7 +1407,13 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
           instant_service->IsInstantProcess(process->GetID()))
         command_line->AppendSwitch(switches::kInstantProcess);
 
-#if !defined(OS_CHROMEOS)
+#if defined(OS_CHROMEOS)
+      // Enterprise enrolled check to disable the easter egg.

[sky, 2015/03/18 20:56:52]

Can you do this in chromeos specific startup code?

[edwardjung, 2015/03/19 10:38:48]

I'm not sure, this was the method suggested by atwilson.  Drew, any thoughts on
this, is there a better CrOS specific place to add this flag?

[sky, 2015/03/19 19:26:13]

I was specifically thinking of something like
browser_process_platform_part_chromeos.

[edwardjung, 2015/03/20 17:36:40]

I tried this and although the flag is set on startup. The flag doesn't seem to
filter down when getting the command line for the current process.

[Andrew T Wilson (Slow), 2015/03/20 19:33:04]

You probably have to call CopySwitchesFrom() explicitly in this routine to copy
kDisableDinosaurEasterEgg from browser -> renderer process.

The nice advantage of that is people who want to disable this on desktop can
just pass that flag in (i.e. the commandline flag is supported on all
platforms).

[edwardjung, 2015/03/23 13:17:15]

Done.

Thanks Drew. 

@sky, moved this check to browser_process_platform_part_chromeos.

+      const bool is_enterprise_managed = g_browser_process->platform_part()->
+              browser_policy_connector_chromeos()->IsEnterpriseManaged();
+      if (is_enterprise_managed)
+        command_line->AppendSwitch(switches::kDisableDinosaurEasterEgg);
+#else
       SigninClient* signin_client =
           ChromeSigninClientFactory::GetForProfile(profile);
       if (signin_client && signin_client->IsSigninProcess(process->GetID()))