Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(528)

Unified Diff: chrome/browser/chrome_content_browser_client.cc

Issue 977323003: Disable easter egg on enterprised enrolled devices (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move switch appending to browser_process_platform_part_chromeos Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..dd1491cd621ef11f124d4a1480fc9eab462e50e7 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"
@@ -1335,6 +1336,12 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
#endif
#if defined(OS_CHROMEOS)
+ static const char* const kchromeOSSwitches[] = {
Andrew T Wilson (Slow) 2015/03/23 16:38:27 nit: kChromeOSSwitches (capital C)
edwardjung 2015/03/24 16:07:35 Done.
+ switches::kDisableDinosaurEasterEgg,
+ };
+ command_line->CopySwitchesFrom(browser_command_line, kchromeOSSwitches,
+ arraysize(kchromeOSSwitches));
+
// On Chrome OS need to pass primary user homedir (in multi-profiles session).
base::FilePath homedir;
PathService::Get(base::DIR_HOME, &homedir);

Powered by Google App Engine
This is Rietveld 408576698