Disable easter egg on enterprised enrolled devices

chrome/browser/browser_process_platform_part_chromeos.cc

 // Copyright (c) 2013 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/browser_process_platform_part_chromeos.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/time/default_tick_clock.h"
 #include "base/time/tick_clock.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/login/session/chrome_session_manager.h"
 #include "chrome/browser/chromeos/login/users/chrome_user_manager_impl.h"
 #include "chrome/browser/chromeos/memory/oom_priority_manager.h"
 #include "chrome/browser/chromeos/net/delay_network_call.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/system/automatic_reboot_manager.h"
 #include "chrome/browser/chromeos/system/device_disabling_manager.h"
 #include "chrome/browser/chromeos/system/device_disabling_manager_default_delegate.h"
 #include "chrome/browser/chromeos/system/timezone_util.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/common/chrome_switches.h"
 #include "chromeos/geolocation/simple_geolocation_provider.h"
 #include "chromeos/timezone/timezone_resolver.h"
 #include "components/session_manager/core/session_manager.h"
 #include "components/user_manager/user_manager.h"
 
 BrowserProcessPlatformPart::BrowserProcessPlatformPart()
     : created_profile_helper_(false) {
 }
 
 BrowserProcessPlatformPart::~BrowserProcessPlatformPart() {
 }
 
 void BrowserProcessPlatformPart::InitializeAutomaticRebootManager() {
   DCHECK(!automatic_reboot_manager_);
 
   automatic_reboot_manager_.reset(new chromeos::system::AutomaticRebootManager(
       scoped_ptr<base::TickClock>(new base::DefaultTickClock)));
 }
 
 void BrowserProcessPlatformPart::ShutdownAutomaticRebootManager() {
   automatic_reboot_manager_.reset();
 }
 
 void BrowserProcessPlatformPart::InitializeChromeUserManager() {
+  DisableDinoEasterEgg();
   DCHECK(!chrome_user_manager_);
   chrome_user_manager_ =
       chromeos::ChromeUserManagerImpl::CreateChromeUserManager();
   chrome_user_manager_->Initialize();
 }
 
 void BrowserProcessPlatformPart::DestroyChromeUserManager() {
   chrome_user_manager_->Destroy();
   chrome_user_manager_.reset();
 }
@@ skipping 11 matching lines @@
 
 void BrowserProcessPlatformPart::ShutdownDeviceDisablingManager() {
   device_disabling_manager_.reset();
   device_disabling_manager_delegate_.reset();
 }
 
 void BrowserProcessPlatformPart::InitializeSessionManager(
     const base::CommandLine& parsed_command_line,
     Profile* profile,
     bool is_running_test) {
+

[sky, 2015/03/23 15:59:20]

remove this line.

[edwardjung, 2015/03/24 16:07:35]

Done.

   DCHECK(!session_manager_);
   session_manager_ = chromeos::ChromeSessionManager::CreateSessionManager(
       parsed_command_line, profile, is_running_test);
 }
 
 void BrowserProcessPlatformPart::ShutdownSessionManager() {
   session_manager_.reset();
 }
 
 session_manager::SessionManager* BrowserProcessPlatformPart::SessionManager() {
@@ skipping 15 matching lines @@
     CreateProfileHelper();
   return profile_helper_.get();
 }
 
 policy::BrowserPolicyConnectorChromeOS*
 BrowserProcessPlatformPart::browser_policy_connector_chromeos() {
   return static_cast<policy::BrowserPolicyConnectorChromeOS*>(
       g_browser_process->browser_policy_connector());
 }
 
+void BrowserProcessPlatformPart::DisableDinoEasterEgg() {
+  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
+  const bool is_enterprise_managed = g_browser_process->platform_part()->
+             browser_policy_connector_chromeos()->IsEnterpriseManaged();
+  if (is_enterprise_managed) {

[sky, 2015/03/23 15:59:20]

nit: no {}

[edwardjung, 2015/03/24 16:07:35]

Done.

+    command_line->AppendSwitch(switches::kDisableDinosaurEasterEgg);
+  }
+}
+
 chromeos::TimeZoneResolver* BrowserProcessPlatformPart::GetTimezoneResolver() {
   if (!timezone_resolver_.get()) {
     timezone_resolver_.reset(new chromeos::TimeZoneResolver(
         g_browser_process->system_request_context(),
         chromeos::SimpleGeolocationProvider::DefaultGeolocationProviderURL(),
         base::Bind(&chromeos::system::ApplyTimeZone),
         base::Bind(&chromeos::DelayNetworkCall,
                    base::TimeDelta::FromMilliseconds(
                        chromeos::kDefaultNetworkRetryDelayMS)),
         g_browser_process->local_state()));
@@ skipping 12 matching lines @@
 BrowserProcessPlatformPart::CreateBrowserPolicyConnector() {
   return scoped_ptr<policy::BrowserPolicyConnector>(
       new policy::BrowserPolicyConnectorChromeOS());
 }
 
 void BrowserProcessPlatformPart::CreateProfileHelper() {
   DCHECK(!created_profile_helper_ && profile_helper_.get() == NULL);
   created_profile_helper_ = true;
   profile_helper_.reset(new chromeos::ProfileHelper());
 }