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

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

Issue 597933002: Restored disable print preview policy. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Thu Sep 25 18:19:02 PDT 2014 Created 6 years, 2 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 | « build/common.gypi ('k') | chrome/browser/policy/configuration_policy_handler_list_factory.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 1271 matching lines...) Expand 10 before | Expand all | Expand 10 after
1282 } 1282 }
1283 1283
1284 // Disable client-side phishing detection in the renderer if it is 1284 // Disable client-side phishing detection in the renderer if it is
1285 // disabled in the Profile preferences or the browser process. 1285 // disabled in the Profile preferences or the browser process.
1286 if (!prefs->GetBoolean(prefs::kSafeBrowsingEnabled) || 1286 if (!prefs->GetBoolean(prefs::kSafeBrowsingEnabled) ||
1287 !g_browser_process->safe_browsing_detection_service()) { 1287 !g_browser_process->safe_browsing_detection_service()) {
1288 command_line->AppendSwitch( 1288 command_line->AppendSwitch(
1289 switches::kDisableClientSidePhishingDetection); 1289 switches::kDisableClientSidePhishingDetection);
1290 } 1290 }
1291 1291
1292 if (prefs->GetBoolean(prefs::kPrintPreviewDisabled))
1293 command_line->AppendSwitch(switches::kDisablePrintPreview);
1294
1292 InstantService* instant_service = 1295 InstantService* instant_service =
1293 InstantServiceFactory::GetForProfile(profile); 1296 InstantServiceFactory::GetForProfile(profile);
1294 if (instant_service && 1297 if (instant_service &&
1295 instant_service->IsInstantProcess(process->GetID())) 1298 instant_service->IsInstantProcess(process->GetID()))
1296 command_line->AppendSwitch(switches::kInstantProcess); 1299 command_line->AppendSwitch(switches::kInstantProcess);
1297 1300
1298 #if !defined(OS_CHROMEOS) 1301 #if !defined(OS_CHROMEOS)
1299 SigninClient* signin_client = 1302 SigninClient* signin_client =
1300 ChromeSigninClientFactory::GetForProfile(profile); 1303 ChromeSigninClientFactory::GetForProfile(profile);
1301 if (signin_client && signin_client->IsSigninProcess(process->GetID())) 1304 if (signin_client && signin_client->IsSigninProcess(process->GetID()))
(...skipping 1308 matching lines...) Expand 10 before | Expand all | Expand 10 after
2610 switches::kDisableWebRtcEncryption, 2613 switches::kDisableWebRtcEncryption,
2611 }; 2614 };
2612 to_command_line->CopySwitchesFrom(from_command_line, 2615 to_command_line->CopySwitchesFrom(from_command_line,
2613 kWebRtcDevSwitchNames, 2616 kWebRtcDevSwitchNames,
2614 arraysize(kWebRtcDevSwitchNames)); 2617 arraysize(kWebRtcDevSwitchNames));
2615 } 2618 }
2616 } 2619 }
2617 #endif // defined(ENABLE_WEBRTC) 2620 #endif // defined(ENABLE_WEBRTC)
2618 2621
2619 } // namespace chrome 2622 } // namespace chrome
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | chrome/browser/policy/configuration_policy_handler_list_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698