| Index: chrome/browser/browser_process_platform_part_chromeos.cc
|
| diff --git a/chrome/browser/browser_process_platform_part_chromeos.cc b/chrome/browser/browser_process_platform_part_chromeos.cc
|
| index 520ba39318fb3ac0a359fef52c7e6e3fb0b614ed..12d6ce6a97ccb52be49e23d9f53251945b1fb68a 100644
|
| --- a/chrome/browser/browser_process_platform_part_chromeos.cc
|
| +++ b/chrome/browser/browser_process_platform_part_chromeos.cc
|
| @@ -21,6 +21,7 @@
|
| #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"
|
| @@ -45,6 +46,7 @@ void BrowserProcessPlatformPart::ShutdownAutomaticRebootManager() {
|
| }
|
|
|
| void BrowserProcessPlatformPart::InitializeChromeUserManager() {
|
| + DisableDinoEasterEggIfEnrolled();
|
| DCHECK(!chrome_user_manager_);
|
| chrome_user_manager_ =
|
| chromeos::ChromeUserManagerImpl::CreateChromeUserManager();
|
| @@ -111,6 +113,14 @@ BrowserProcessPlatformPart::browser_policy_connector_chromeos() {
|
| g_browser_process->browser_policy_connector());
|
| }
|
|
|
| +void BrowserProcessPlatformPart::DisableDinoEasterEggIfEnrolled() {
|
| + 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)
|
| + command_line->AppendSwitch(switches::kDisableDinosaurEasterEgg);
|
| +}
|
| +
|
| chromeos::TimeZoneResolver* BrowserProcessPlatformPart::GetTimezoneResolver() {
|
| if (!timezone_resolver_.get()) {
|
| timezone_resolver_.reset(new chromeos::TimeZoneResolver(
|
|
|