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

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 488853002: Removed --disable-print-preview switch and policy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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 | Annotate | Revision Log
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 1259 matching lines...) Expand 10 before | Expand all | Expand 10 after
1270 } 1270 }
1271 1271
1272 // Disable client-side phishing detection in the renderer if it is 1272 // Disable client-side phishing detection in the renderer if it is
1273 // disabled in the Profile preferences or the browser process. 1273 // disabled in the Profile preferences or the browser process.
1274 if (!prefs->GetBoolean(prefs::kSafeBrowsingEnabled) || 1274 if (!prefs->GetBoolean(prefs::kSafeBrowsingEnabled) ||
1275 !g_browser_process->safe_browsing_detection_service()) { 1275 !g_browser_process->safe_browsing_detection_service()) {
1276 command_line->AppendSwitch( 1276 command_line->AppendSwitch(
1277 switches::kDisableClientSidePhishingDetection); 1277 switches::kDisableClientSidePhishingDetection);
1278 } 1278 }
1279 1279
1280 if (!prefs->GetBoolean(prefs::kPrintPreviewDisabled))
1281 command_line->AppendSwitch(switches::kRendererPrintPreview);
1282
1283 InstantService* instant_service = 1280 InstantService* instant_service =
1284 InstantServiceFactory::GetForProfile(profile); 1281 InstantServiceFactory::GetForProfile(profile);
1285 if (instant_service && 1282 if (instant_service &&
1286 instant_service->IsInstantProcess(process->GetID())) 1283 instant_service->IsInstantProcess(process->GetID()))
1287 command_line->AppendSwitch(switches::kInstantProcess); 1284 command_line->AppendSwitch(switches::kInstantProcess);
1288 1285
1289 #if !defined(OS_CHROMEOS) 1286 #if !defined(OS_CHROMEOS)
1290 SigninClient* signin_client = 1287 SigninClient* signin_client =
1291 ChromeSigninClientFactory::GetForProfile(profile); 1288 ChromeSigninClientFactory::GetForProfile(profile);
1292 if (signin_client && signin_client->IsSigninProcess(process->GetID())) 1289 if (signin_client && signin_client->IsSigninProcess(process->GetID()))
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
1334 extensions::switches::kEnableEmbeddedExtensionOptions, 1331 extensions::switches::kEnableEmbeddedExtensionOptions,
1335 extensions::switches::kEnableExperimentalExtensionApis, 1332 extensions::switches::kEnableExperimentalExtensionApis,
1336 extensions::switches::kEnableScriptsRequireAction, 1333 extensions::switches::kEnableScriptsRequireAction,
1337 extensions::switches::kExtensionsOnChromeURLs, 1334 extensions::switches::kExtensionsOnChromeURLs,
1338 extensions::switches::kWhitelistedExtensionID, 1335 extensions::switches::kWhitelistedExtensionID,
1339 switches::kAppsCheckoutURL, 1336 switches::kAppsCheckoutURL,
1340 switches::kAppsGalleryURL, 1337 switches::kAppsGalleryURL,
1341 switches::kCloudPrintURL, 1338 switches::kCloudPrintURL,
1342 switches::kCloudPrintXmppEndpoint, 1339 switches::kCloudPrintXmppEndpoint,
1343 switches::kDisableBundledPpapiFlash, 1340 switches::kDisableBundledPpapiFlash,
1344 switches::kDisableScriptedPrintThrottling,
1345 switches::kEnableAppView, 1341 switches::kEnableAppView,
1346 switches::kEnableAppWindowControls, 1342 switches::kEnableAppWindowControls,
1347 switches::kEnableBenchmarking, 1343 switches::kEnableBenchmarking,
1348 switches::kEnableNaCl, 1344 switches::kEnableNaCl,
1349 #if !defined(DISABLE_NACL) 1345 #if !defined(DISABLE_NACL)
1350 switches::kEnableNaClDebug, 1346 switches::kEnableNaClDebug,
1351 switches::kEnableNaClNonSfiMode, 1347 switches::kEnableNaClNonSfiMode,
1352 #endif 1348 #endif
1353 switches::kEnableNetBenchmarking, 1349 switches::kEnableNetBenchmarking,
1354 switches::kEnableShowModalDialog, 1350 switches::kEnableShowModalDialog,
(...skipping 1259 matching lines...) Expand 10 before | Expand all | Expand 10 after
2614 switches::kDisableWebRtcEncryption, 2610 switches::kDisableWebRtcEncryption,
2615 }; 2611 };
2616 to_command_line->CopySwitchesFrom(from_command_line, 2612 to_command_line->CopySwitchesFrom(from_command_line,
2617 kWebRtcDevSwitchNames, 2613 kWebRtcDevSwitchNames,
2618 arraysize(kWebRtcDevSwitchNames)); 2614 arraysize(kWebRtcDevSwitchNames));
2619 } 2615 }
2620 } 2616 }
2621 #endif // defined(ENABLE_WEBRTC) 2617 #endif // defined(ENABLE_WEBRTC)
2622 2618
2623 } // namespace chrome 2619 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698