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

Side by Side 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: Remove debug, fix indentation in JS 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chrome_content_browser_client.h" 5 #include "chrome/browser/chrome_content_browser_client.h"
6 6
7 #include <set> 7 #include <set>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 #include "chrome/browser/spellchecker/spellcheck_message_filter_mac.h" 147 #include "chrome/browser/spellchecker/spellcheck_message_filter_mac.h"
148 #include "components/crash/app/breakpad_mac.h" 148 #include "components/crash/app/breakpad_mac.h"
149 #elif defined(OS_CHROMEOS) 149 #elif defined(OS_CHROMEOS)
150 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h" 150 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h"
151 #include "chrome/browser/chromeos/drive/fileapi/file_system_backend_delegate.h" 151 #include "chrome/browser/chromeos/drive/fileapi/file_system_backend_delegate.h"
152 #include "chrome/browser/chromeos/file_manager/app_id.h" 152 #include "chrome/browser/chromeos/file_manager/app_id.h"
153 #include "chrome/browser/chromeos/file_system_provider/fileapi/backend_delegate. h" 153 #include "chrome/browser/chromeos/file_system_provider/fileapi/backend_delegate. h"
154 #include "chrome/browser/chromeos/fileapi/file_system_backend.h" 154 #include "chrome/browser/chromeos/fileapi/file_system_backend.h"
155 #include "chrome/browser/chromeos/fileapi/mtp_file_system_backend_delegate.h" 155 #include "chrome/browser/chromeos/fileapi/mtp_file_system_backend_delegate.h"
156 #include "chrome/browser/chromeos/login/startup_utils.h" 156 #include "chrome/browser/chromeos/login/startup_utils.h"
157 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
157 #include "chrome/browser/chromeos/system/input_device_settings.h" 158 #include "chrome/browser/chromeos/system/input_device_settings.h"
158 #include "chromeos/chromeos_switches.h" 159 #include "chromeos/chromeos_switches.h"
159 #include "components/user_manager/user_manager.h" 160 #include "components/user_manager/user_manager.h"
160 #elif defined(OS_LINUX) 161 #elif defined(OS_LINUX)
161 #include "chrome/browser/chrome_browser_main_linux.h" 162 #include "chrome/browser/chrome_browser_main_linux.h"
162 #elif defined(OS_ANDROID) 163 #elif defined(OS_ANDROID)
163 #include "chrome/browser/android/new_tab_page_url_handler.h" 164 #include "chrome/browser/android/new_tab_page_url_handler.h"
164 #include "chrome/browser/android/service_tab_launcher.h" 165 #include "chrome/browser/android/service_tab_launcher.h"
165 #include "chrome/browser/android/webapps/single_tab_mode_tab_helper.h" 166 #include "chrome/browser/android/webapps/single_tab_mode_tab_helper.h"
166 #include "chrome/browser/chrome_browser_main_android.h" 167 #include "chrome/browser/chrome_browser_main_android.h"
(...skipping 1161 matching lines...) Expand 10 before | Expand all | Expand 10 after
1328 #if defined(ENABLE_IPC_FUZZER) 1329 #if defined(ENABLE_IPC_FUZZER)
1329 static const char* const kIpcFuzzerSwitches[] = { 1330 static const char* const kIpcFuzzerSwitches[] = {
1330 switches::kIpcDumpDirectory, 1331 switches::kIpcDumpDirectory,
1331 switches::kIpcFuzzerTestcase, 1332 switches::kIpcFuzzerTestcase,
1332 }; 1333 };
1333 command_line->CopySwitchesFrom(browser_command_line, kIpcFuzzerSwitches, 1334 command_line->CopySwitchesFrom(browser_command_line, kIpcFuzzerSwitches,
1334 arraysize(kIpcFuzzerSwitches)); 1335 arraysize(kIpcFuzzerSwitches));
1335 #endif 1336 #endif
1336 1337
1337 #if defined(OS_CHROMEOS) 1338 #if defined(OS_CHROMEOS)
1339 static const char* const kChromeOSSwitches[] = {
1340 switches::kDisableDinosaurEasterEgg,
1341 };
1342 command_line->CopySwitchesFrom(browser_command_line, kChromeOSSwitches,
1343 arraysize(kChromeOSSwitches));
1344
1338 // On Chrome OS need to pass primary user homedir (in multi-profiles session). 1345 // On Chrome OS need to pass primary user homedir (in multi-profiles session).
1339 base::FilePath homedir; 1346 base::FilePath homedir;
1340 PathService::Get(base::DIR_HOME, &homedir); 1347 PathService::Get(base::DIR_HOME, &homedir);
1341 command_line->AppendSwitchASCII(chromeos::switches::kHomedir, 1348 command_line->AppendSwitchASCII(chromeos::switches::kHomedir,
1342 homedir.value().c_str()); 1349 homedir.value().c_str());
1343 #endif 1350 #endif
1344 1351
1345 if (process_type == switches::kRendererProcess) { 1352 if (process_type == switches::kRendererProcess) {
1346 content::RenderProcessHost* process = 1353 content::RenderProcessHost* process =
1347 content::RenderProcessHost::FromID(child_process_id); 1354 content::RenderProcessHost::FromID(child_process_id);
(...skipping 1293 matching lines...) Expand 10 before | Expand all | Expand 10 after
2641 switches::kDisableWebRtcEncryption, 2648 switches::kDisableWebRtcEncryption,
2642 }; 2649 };
2643 to_command_line->CopySwitchesFrom(from_command_line, 2650 to_command_line->CopySwitchesFrom(from_command_line,
2644 kWebRtcDevSwitchNames, 2651 kWebRtcDevSwitchNames,
2645 arraysize(kWebRtcDevSwitchNames)); 2652 arraysize(kWebRtcDevSwitchNames));
2646 } 2653 }
2647 } 2654 }
2648 #endif // defined(ENABLE_WEBRTC) 2655 #endif // defined(ENABLE_WEBRTC)
2649 2656
2650 } // namespace chrome 2657 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/browser_process_platform_part_chromeos.cc ('k') | chrome/browser/errorpage_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698