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

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

Issue 523463003: Manual fixups in chrome/ for scoped_refptr operator T* removal. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 2546 matching lines...) Expand 10 before | Expand all | Expand 10 after
2557 return false; 2557 return false;
2558 #endif 2558 #endif
2559 } 2559 }
2560 2560
2561 net::CookieStore* 2561 net::CookieStore*
2562 ChromeContentBrowserClient::OverrideCookieStoreForRenderProcess( 2562 ChromeContentBrowserClient::OverrideCookieStoreForRenderProcess(
2563 int render_process_id) { 2563 int render_process_id) {
2564 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 2564 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
2565 if (!prerender_tracker_) 2565 if (!prerender_tracker_)
2566 return NULL; 2566 return NULL;
2567 return prerender_tracker_-> 2567 return prerender_tracker_->GetPrerenderCookieStoreForRenderProcess(
2568 GetPrerenderCookieStoreForRenderProcess(render_process_id); 2568 render_process_id).get();
2569 } 2569 }
2570 2570
2571 #if defined(ENABLE_WEBRTC) 2571 #if defined(ENABLE_WEBRTC)
2572 void ChromeContentBrowserClient::MaybeCopyDisableWebRtcEncryptionSwitch( 2572 void ChromeContentBrowserClient::MaybeCopyDisableWebRtcEncryptionSwitch(
2573 CommandLine* to_command_line, 2573 CommandLine* to_command_line,
2574 const CommandLine& from_command_line, 2574 const CommandLine& from_command_line,
2575 VersionInfo::Channel channel) { 2575 VersionInfo::Channel channel) {
2576 #if defined(OS_ANDROID) 2576 #if defined(OS_ANDROID)
2577 const VersionInfo::Channel kMaxDisableEncryptionChannel = 2577 const VersionInfo::Channel kMaxDisableEncryptionChannel =
2578 VersionInfo::CHANNEL_BETA; 2578 VersionInfo::CHANNEL_BETA;
2579 #else 2579 #else
2580 const VersionInfo::Channel kMaxDisableEncryptionChannel = 2580 const VersionInfo::Channel kMaxDisableEncryptionChannel =
2581 VersionInfo::CHANNEL_DEV; 2581 VersionInfo::CHANNEL_DEV;
2582 #endif 2582 #endif
2583 if (channel <= kMaxDisableEncryptionChannel) { 2583 if (channel <= kMaxDisableEncryptionChannel) {
2584 static const char* const kWebRtcDevSwitchNames[] = { 2584 static const char* const kWebRtcDevSwitchNames[] = {
2585 switches::kDisableWebRtcEncryption, 2585 switches::kDisableWebRtcEncryption,
2586 }; 2586 };
2587 to_command_line->CopySwitchesFrom(from_command_line, 2587 to_command_line->CopySwitchesFrom(from_command_line,
2588 kWebRtcDevSwitchNames, 2588 kWebRtcDevSwitchNames,
2589 arraysize(kWebRtcDevSwitchNames)); 2589 arraysize(kWebRtcDevSwitchNames));
2590 } 2590 }
2591 } 2591 }
2592 #endif // defined(ENABLE_WEBRTC) 2592 #endif // defined(ENABLE_WEBRTC)
2593 2593
2594 } // namespace chrome 2594 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/browser_process_impl.cc ('k') | chrome/browser/power/process_power_collector_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698