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

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: Tue Aug 19 16:35:18 PDT 2014 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)) 1280 command_line->AppendSwitch(switches::kRendererPrintPreview);
Lei Zhang 2014/08/20 00:01:15 You should get rid of switches::kRendererPrintPrev
Vitaly Buka (NO REVIEWS) 2014/08/20 01:16:14 Done.
1281 command_line->AppendSwitch(switches::kRendererPrintPreview);
1282 1281
1283 InstantService* instant_service = 1282 InstantService* instant_service =
1284 InstantServiceFactory::GetForProfile(profile); 1283 InstantServiceFactory::GetForProfile(profile);
1285 if (instant_service && 1284 if (instant_service &&
1286 instant_service->IsInstantProcess(process->GetID())) 1285 instant_service->IsInstantProcess(process->GetID()))
1287 command_line->AppendSwitch(switches::kInstantProcess); 1286 command_line->AppendSwitch(switches::kInstantProcess);
1288 1287
1289 #if !defined(OS_CHROMEOS) 1288 #if !defined(OS_CHROMEOS)
1290 SigninClient* signin_client = 1289 SigninClient* signin_client =
1291 ChromeSigninClientFactory::GetForProfile(profile); 1290 ChromeSigninClientFactory::GetForProfile(profile);
(...skipping 1322 matching lines...) Expand 10 before | Expand all | Expand 10 after
2614 switches::kDisableWebRtcEncryption, 2613 switches::kDisableWebRtcEncryption,
2615 }; 2614 };
2616 to_command_line->CopySwitchesFrom(from_command_line, 2615 to_command_line->CopySwitchesFrom(from_command_line,
2617 kWebRtcDevSwitchNames, 2616 kWebRtcDevSwitchNames,
2618 arraysize(kWebRtcDevSwitchNames)); 2617 arraysize(kWebRtcDevSwitchNames));
2619 } 2618 }
2620 } 2619 }
2621 #endif // defined(ENABLE_WEBRTC) 2620 #endif // defined(ENABLE_WEBRTC)
2622 2621
2623 } // namespace chrome 2622 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698