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

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 chrome/browser/errorpage_browsertest.cc 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
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/errorpage_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1232 matching lines...) Expand 10 before | Expand all | Expand 10 after
1399 1400
1400 if (prefs->GetBoolean(prefs::kPrintPreviewDisabled)) 1401 if (prefs->GetBoolean(prefs::kPrintPreviewDisabled))
1401 command_line->AppendSwitch(switches::kDisablePrintPreview); 1402 command_line->AppendSwitch(switches::kDisablePrintPreview);
1402 1403
1403 InstantService* instant_service = 1404 InstantService* instant_service =
1404 InstantServiceFactory::GetForProfile(profile); 1405 InstantServiceFactory::GetForProfile(profile);
1405 if (instant_service && 1406 if (instant_service &&
1406 instant_service->IsInstantProcess(process->GetID())) 1407 instant_service->IsInstantProcess(process->GetID()))
1407 command_line->AppendSwitch(switches::kInstantProcess); 1408 command_line->AppendSwitch(switches::kInstantProcess);
1408 1409
1409 #if !defined(OS_CHROMEOS) 1410 #if defined(OS_CHROMEOS)
1411 // Enterprise enrolled check to disable the easter egg.
sky 2015/03/18 20:56:52 Can you do this in chromeos specific startup code?
edwardjung 2015/03/19 10:38:48 I'm not sure, this was the method suggested by atw
sky 2015/03/19 19:26:13 I was specifically thinking of something like brow
edwardjung 2015/03/20 17:36:40 I tried this and although the flag is set on start
Andrew T Wilson (Slow) 2015/03/20 19:33:04 You probably have to call CopySwitchesFrom() expli
edwardjung 2015/03/23 13:17:15 Done. Thanks Drew. @sky, moved this check to br
1412 const bool is_enterprise_managed = g_browser_process->platform_part()->
1413 browser_policy_connector_chromeos()->IsEnterpriseManaged();
1414 if (is_enterprise_managed)
1415 command_line->AppendSwitch(switches::kDisableDinosaurEasterEgg);
1416 #else
1410 SigninClient* signin_client = 1417 SigninClient* signin_client =
1411 ChromeSigninClientFactory::GetForProfile(profile); 1418 ChromeSigninClientFactory::GetForProfile(profile);
1412 if (signin_client && signin_client->IsSigninProcess(process->GetID())) 1419 if (signin_client && signin_client->IsSigninProcess(process->GetID()))
1413 command_line->AppendSwitch(switches::kSigninProcess); 1420 command_line->AppendSwitch(switches::kSigninProcess);
1414 #endif 1421 #endif
1415 } 1422 }
1416 1423
1417 if (IsAutoReloadEnabled()) 1424 if (IsAutoReloadEnabled())
1418 command_line->AppendSwitch(switches::kEnableOfflineAutoReload); 1425 command_line->AppendSwitch(switches::kEnableOfflineAutoReload);
1419 if (IsAutoReloadVisibleOnlyEnabled()) { 1426 if (IsAutoReloadVisibleOnlyEnabled()) {
(...skipping 1221 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/app/generated_resources.grd ('k') | chrome/browser/errorpage_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698