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

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

Issue 1393193005: Implement $Secure- cookie prefix (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add test Created 5 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
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 <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 624 matching lines...) Expand 10 before | Expand all | Expand 10 after
635 WebUSBPermissionProvider::Create(render_frame_host, 635 WebUSBPermissionProvider::Create(render_frame_host,
636 mojo::GetProxy(&permission_provider)); 636 mojo::GetProxy(&permission_provider));
637 device::usb::DeviceManagerImpl::Create(permission_provider.Pass(), 637 device::usb::DeviceManagerImpl::Create(permission_provider.Pass(),
638 request.Pass()); 638 request.Pass());
639 #endif // !defined(OS_ANDROID) && !defined(OS_IOS) 639 #endif // !defined(OS_ANDROID) && !defined(OS_IOS)
640 } 640 }
641 641
642 } // namespace 642 } // namespace
643 643
644 ChromeContentBrowserClient::ChromeContentBrowserClient() 644 ChromeContentBrowserClient::ChromeContentBrowserClient()
645 : 645 : experimental_web_platform_features_enabled_(
646 base::CommandLine::ForCurrentProcess()
647 ->HasSwitch(switches::kEnableExperimentalWebPlatformFeatures)),
jochen (gone - plz use gerrit) 2015/10/12 09:31:41 that's a content switch, you can just access it in
estark 2015/10/12 09:39:19 That might be a little weird for non-chrome conten
646 weak_factory_(this) { 648 weak_factory_(this) {
647 #if defined(ENABLE_PLUGINS) 649 #if defined(ENABLE_PLUGINS)
648 for (size_t i = 0; i < arraysize(kPredefinedAllowedDevChannelOrigins); ++i) 650 for (size_t i = 0; i < arraysize(kPredefinedAllowedDevChannelOrigins); ++i)
649 allowed_dev_channel_origins_.insert(kPredefinedAllowedDevChannelOrigins[i]); 651 allowed_dev_channel_origins_.insert(kPredefinedAllowedDevChannelOrigins[i]);
650 for (size_t i = 0; i < arraysize(kPredefinedAllowedFileHandleOrigins); ++i) 652 for (size_t i = 0; i < arraysize(kPredefinedAllowedFileHandleOrigins); ++i)
651 allowed_file_handle_origins_.insert(kPredefinedAllowedFileHandleOrigins[i]); 653 allowed_file_handle_origins_.insert(kPredefinedAllowedFileHandleOrigins[i]);
652 for (size_t i = 0; i < arraysize(kPredefinedAllowedSocketOrigins); ++i) 654 for (size_t i = 0; i < arraysize(kPredefinedAllowedSocketOrigins); ++i)
653 allowed_socket_origins_.insert(kPredefinedAllowedSocketOrigins[i]); 655 allowed_socket_origins_.insert(kPredefinedAllowedSocketOrigins[i]);
654 656
655 extra_parts_.push_back(new ChromeContentBrowserClientPluginsPart); 657 extra_parts_.push_back(new ChromeContentBrowserClientPluginsPart);
(...skipping 2034 matching lines...) Expand 10 before | Expand all | Expand 10 after
2690 Profile* profile = 2692 Profile* profile =
2691 Profile::FromBrowserContext(web_contents->GetBrowserContext()); 2693 Profile::FromBrowserContext(web_contents->GetBrowserContext());
2692 prerender::PrerenderManager* prerender_manager = 2694 prerender::PrerenderManager* prerender_manager =
2693 prerender::PrerenderManagerFactory::GetForProfile(profile); 2695 prerender::PrerenderManagerFactory::GetForProfile(profile);
2694 if (prerender_manager && 2696 if (prerender_manager &&
2695 prerender_manager->IsWebContentsPrerendering(web_contents, nullptr)) { 2697 prerender_manager->IsWebContentsPrerendering(web_contents, nullptr)) {
2696 *visibility_state = blink::WebPageVisibilityStatePrerender; 2698 *visibility_state = blink::WebPageVisibilityStatePrerender;
2697 } 2699 }
2698 } 2700 }
2699 2701
2702 bool ChromeContentBrowserClient::ExperimentalCookieFeaturesEnabled() {
2703 return experimental_web_platform_features_enabled_;
2704 }
2705
2700 #if defined(ENABLE_WEBRTC) 2706 #if defined(ENABLE_WEBRTC)
2701 void ChromeContentBrowserClient::MaybeCopyDisableWebRtcEncryptionSwitch( 2707 void ChromeContentBrowserClient::MaybeCopyDisableWebRtcEncryptionSwitch(
2702 base::CommandLine* to_command_line, 2708 base::CommandLine* to_command_line,
2703 const base::CommandLine& from_command_line, 2709 const base::CommandLine& from_command_line,
2704 version_info::Channel channel) { 2710 version_info::Channel channel) {
2705 #if defined(OS_ANDROID) 2711 #if defined(OS_ANDROID)
2706 const version_info::Channel kMaxDisableEncryptionChannel = 2712 const version_info::Channel kMaxDisableEncryptionChannel =
2707 version_info::Channel::BETA; 2713 version_info::Channel::BETA;
2708 #else 2714 #else
2709 const version_info::Channel kMaxDisableEncryptionChannel = 2715 const version_info::Channel kMaxDisableEncryptionChannel =
2710 version_info::Channel::DEV; 2716 version_info::Channel::DEV;
2711 #endif 2717 #endif
2712 if (channel <= kMaxDisableEncryptionChannel) { 2718 if (channel <= kMaxDisableEncryptionChannel) {
2713 static const char* const kWebRtcDevSwitchNames[] = { 2719 static const char* const kWebRtcDevSwitchNames[] = {
2714 switches::kDisableWebRtcEncryption, 2720 switches::kDisableWebRtcEncryption,
2715 }; 2721 };
2716 to_command_line->CopySwitchesFrom(from_command_line, 2722 to_command_line->CopySwitchesFrom(from_command_line,
2717 kWebRtcDevSwitchNames, 2723 kWebRtcDevSwitchNames,
2718 arraysize(kWebRtcDevSwitchNames)); 2724 arraysize(kWebRtcDevSwitchNames));
2719 } 2725 }
2720 } 2726 }
2721 #endif // defined(ENABLE_WEBRTC) 2727 #endif // defined(ENABLE_WEBRTC)
OLDNEW
« no previous file with comments | « chrome/browser/chrome_content_browser_client.h ('k') | chrome/browser/extensions/api/cookies/cookies_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698