Disable easter egg on enterprised enrolled devices

chrome/browser/chrome_content_browser_client.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chrome_content_browser_client.h"
 
 #include <set>
 #include <utility>
 #include <vector>
 
@@ skipping 136 matching lines @@
 #include "chrome/browser/spellchecker/spellcheck_message_filter_mac.h"
 #include "components/crash/app/breakpad_mac.h"
 #elif defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h"
 #include "chrome/browser/chromeos/drive/fileapi/file_system_backend_delegate.h"
 #include "chrome/browser/chromeos/file_manager/app_id.h"
 #include "chrome/browser/chromeos/file_system_provider/fileapi/backend_delegate.h"
 #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"
 #elif defined(OS_LINUX)
 #include "chrome/browser/chrome_browser_main_linux.h"
 #elif defined(OS_ANDROID)
 #include "chrome/browser/android/new_tab_page_url_handler.h"
 #include "chrome/browser/android/service_tab_launcher.h"
 #include "chrome/browser/android/webapps/single_tab_mode_tab_helper.h"
 #include "chrome/browser/chrome_browser_main_android.h"
@@ skipping 1238 matching lines @@
           InstantServiceFactory::GetForProfile(profile);
       if (instant_service &&
           instant_service->IsInstantProcess(process->GetID()))
         command_line->AppendSwitch(switches::kInstantProcess);
 
 #if !defined(OS_CHROMEOS)
       SigninClient* signin_client =
           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
     }
 
     if (IsAutoReloadEnabled())
       command_line->AppendSwitch(switches::kEnableOfflineAutoReload);
     if (IsAutoReloadVisibleOnlyEnabled()) {
       command_line->AppendSwitch(
           switches::kEnableOfflineAutoReloadVisibleOnly);
     }
 
@@ skipping 1217 matching lines @@
       switches::kDisableWebRtcEncryption,
     };
     to_command_line->CopySwitchesFrom(from_command_line,
                                       kWebRtcDevSwitchNames,
                                       arraysize(kWebRtcDevSwitchNames));
   }
 }
 #endif  // defined(ENABLE_WEBRTC)
 
 }  // namespace chrome