| OLD | NEW |
| 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 <map> | 7 #include <map> |
| 8 #include <set> | 8 #include <set> |
| 9 #include <utility> | 9 #include <utility> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 2326 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2337 #if defined(OS_WIN) | 2337 #if defined(OS_WIN) |
| 2338 const wchar_t* ChromeContentBrowserClient::GetResourceDllName() { | 2338 const wchar_t* ChromeContentBrowserClient::GetResourceDllName() { |
| 2339 return chrome::kBrowserResourcesDll; | 2339 return chrome::kBrowserResourcesDll; |
| 2340 } | 2340 } |
| 2341 | 2341 |
| 2342 base::string16 ChromeContentBrowserClient::GetAppContainerSidForSandboxType( | 2342 base::string16 ChromeContentBrowserClient::GetAppContainerSidForSandboxType( |
| 2343 int sandbox_type) const { | 2343 int sandbox_type) const { |
| 2344 base::string16 sid; | 2344 base::string16 sid; |
| 2345 | 2345 |
| 2346 #if defined(GOOGLE_CHROME_BUILD) | 2346 #if defined(GOOGLE_CHROME_BUILD) |
| 2347 const chrome::VersionInfo::Channel channel = | 2347 const version_info::Channel channel = |
| 2348 chrome::VersionInfo::GetChannel(); | 2348 chrome::VersionInfo::GetChannel(); |
| 2349 | 2349 |
| 2350 // It's possible to have a SxS installation running at the same time as a | 2350 // It's possible to have a SxS installation running at the same time as a |
| 2351 // non-SxS so isolate them from each other. | 2351 // non-SxS so isolate them from each other. |
| 2352 if (channel == chrome::VersionInfo::CHANNEL_CANARY) { | 2352 if (channel == version_info::CHANNEL_CANARY) { |
| 2353 sid.assign( | 2353 sid.assign( |
| 2354 L"S-1-15-2-3251537155-1984446955-2931258699-841473695-1938553385-" | 2354 L"S-1-15-2-3251537155-1984446955-2931258699-841473695-1938553385-" |
| 2355 L"924012150-"); | 2355 L"924012150-"); |
| 2356 } else { | 2356 } else { |
| 2357 sid.assign( | 2357 sid.assign( |
| 2358 L"S-1-15-2-3251537155-1984446955-2931258699-841473695-1938553385-" | 2358 L"S-1-15-2-3251537155-1984446955-2931258699-841473695-1938553385-" |
| 2359 L"924012149-"); | 2359 L"924012149-"); |
| 2360 } | 2360 } |
| 2361 #else | 2361 #else |
| 2362 sid.assign( | 2362 sid.assign( |
| (...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2530 if (prerender_manager && | 2530 if (prerender_manager && |
| 2531 prerender_manager->IsWebContentsPrerendering(web_contents, nullptr)) { | 2531 prerender_manager->IsWebContentsPrerendering(web_contents, nullptr)) { |
| 2532 *visibility_state = blink::WebPageVisibilityStatePrerender; | 2532 *visibility_state = blink::WebPageVisibilityStatePrerender; |
| 2533 } | 2533 } |
| 2534 } | 2534 } |
| 2535 | 2535 |
| 2536 #if defined(ENABLE_WEBRTC) | 2536 #if defined(ENABLE_WEBRTC) |
| 2537 void ChromeContentBrowserClient::MaybeCopyDisableWebRtcEncryptionSwitch( | 2537 void ChromeContentBrowserClient::MaybeCopyDisableWebRtcEncryptionSwitch( |
| 2538 base::CommandLine* to_command_line, | 2538 base::CommandLine* to_command_line, |
| 2539 const base::CommandLine& from_command_line, | 2539 const base::CommandLine& from_command_line, |
| 2540 VersionInfo::Channel channel) { | 2540 version_info::Channel channel) { |
| 2541 #if defined(OS_ANDROID) | 2541 #if defined(OS_ANDROID) |
| 2542 const VersionInfo::Channel kMaxDisableEncryptionChannel = | 2542 const version_info::Channel kMaxDisableEncryptionChannel = |
| 2543 VersionInfo::CHANNEL_BETA; | 2543 version_info::CHANNEL_BETA; |
| 2544 #else | 2544 #else |
| 2545 const VersionInfo::Channel kMaxDisableEncryptionChannel = | 2545 const version_info::Channel kMaxDisableEncryptionChannel = |
| 2546 VersionInfo::CHANNEL_DEV; | 2546 version_info::CHANNEL_DEV; |
| 2547 #endif | 2547 #endif |
| 2548 if (channel <= kMaxDisableEncryptionChannel) { | 2548 if (channel <= kMaxDisableEncryptionChannel) { |
| 2549 static const char* const kWebRtcDevSwitchNames[] = { | 2549 static const char* const kWebRtcDevSwitchNames[] = { |
| 2550 switches::kDisableWebRtcEncryption, | 2550 switches::kDisableWebRtcEncryption, |
| 2551 }; | 2551 }; |
| 2552 to_command_line->CopySwitchesFrom(from_command_line, | 2552 to_command_line->CopySwitchesFrom(from_command_line, |
| 2553 kWebRtcDevSwitchNames, | 2553 kWebRtcDevSwitchNames, |
| 2554 arraysize(kWebRtcDevSwitchNames)); | 2554 arraysize(kWebRtcDevSwitchNames)); |
| 2555 } | 2555 } |
| 2556 } | 2556 } |
| 2557 #endif // defined(ENABLE_WEBRTC) | 2557 #endif // defined(ENABLE_WEBRTC) |
| 2558 | 2558 |
| 2559 } // namespace chrome | 2559 } // namespace chrome |
| OLD | NEW |