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

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

Issue 1698973002: Exempt Save-Data header from CORS preflight request check (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added layout test Created 4 years, 10 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 | « no previous file | third_party/WebKit/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-data-saver.html » ('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 <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 677 matching lines...) Expand 10 before | Expand all | Expand 10 after
688 NOTREACHED(); 688 NOTREACHED();
689 return; 689 return;
690 } 690 }
691 691
692 UsbTabHelper* tab_helper = 692 UsbTabHelper* tab_helper =
693 UsbTabHelper::GetOrCreateForWebContents(web_contents); 693 UsbTabHelper::GetOrCreateForWebContents(web_contents);
694 tab_helper->CreatePermissionBubble(render_frame_host, std::move(request)); 694 tab_helper->CreatePermissionBubble(render_frame_host, std::move(request));
695 } 695 }
696 #endif // !defined(OS_ANDROID) && !defined(OS_IOS) 696 #endif // !defined(OS_ANDROID) && !defined(OS_IOS)
697 697
698 bool GetDataSaverEnabledPref(const PrefService* prefs) {
699 // Enable data saver only when data saver pref is enabled and not part of
700 // "Disabled" group of "SaveDataHeader" experiment.
701 return prefs->GetBoolean(prefs::kDataSaverEnabled) &&
702 base::FieldTrialList::FindFullName("SaveDataHeader")
703 .compare("Disabled");
704 }
705
698 } // namespace 706 } // namespace
699 707
700 ChromeContentBrowserClient::ChromeContentBrowserClient() 708 ChromeContentBrowserClient::ChromeContentBrowserClient()
701 : 709 :
702 weak_factory_(this) { 710 weak_factory_(this) {
703 #if defined(ENABLE_PLUGINS) 711 #if defined(ENABLE_PLUGINS)
704 for (size_t i = 0; i < arraysize(kPredefinedAllowedDevChannelOrigins); ++i) 712 for (size_t i = 0; i < arraysize(kPredefinedAllowedDevChannelOrigins); ++i)
705 allowed_dev_channel_origins_.insert(kPredefinedAllowedDevChannelOrigins[i]); 713 allowed_dev_channel_origins_.insert(kPredefinedAllowedDevChannelOrigins[i]);
706 for (size_t i = 0; i < arraysize(kPredefinedAllowedFileHandleOrigins); ++i) 714 for (size_t i = 0; i < arraysize(kPredefinedAllowedFileHandleOrigins); ++i)
707 allowed_file_handle_origins_.insert(kPredefinedAllowedFileHandleOrigins[i]); 715 allowed_file_handle_origins_.insert(kPredefinedAllowedFileHandleOrigins[i]);
(...skipping 1664 matching lines...) Expand 10 before | Expand all | Expand 10 after
2372 } 2380 }
2373 DCHECK(!web_prefs->default_encoding.empty()); 2381 DCHECK(!web_prefs->default_encoding.empty());
2374 2382
2375 if (base::CommandLine::ForCurrentProcess()->HasSwitch( 2383 if (base::CommandLine::ForCurrentProcess()->HasSwitch(
2376 switches::kEnablePotentiallyAnnoyingSecurityFeatures)) { 2384 switches::kEnablePotentiallyAnnoyingSecurityFeatures)) {
2377 web_prefs->disable_reading_from_canvas = true; 2385 web_prefs->disable_reading_from_canvas = true;
2378 web_prefs->strict_mixed_content_checking = true; 2386 web_prefs->strict_mixed_content_checking = true;
2379 web_prefs->strict_powerful_feature_restrictions = true; 2387 web_prefs->strict_powerful_feature_restrictions = true;
2380 } 2388 }
2381 2389
2382 web_prefs->data_saver_enabled = 2390 web_prefs->data_saver_enabled = GetDataSaverEnabledPref(prefs);
2383 prefs->GetBoolean(prefs::kDataSaverEnabled);
2384 2391
2385 for (size_t i = 0; i < extra_parts_.size(); ++i) 2392 for (size_t i = 0; i < extra_parts_.size(); ++i)
2386 extra_parts_[i]->OverrideWebkitPrefs(rvh, web_prefs); 2393 extra_parts_[i]->OverrideWebkitPrefs(rvh, web_prefs);
2387 } 2394 }
2388 2395
2389 void ChromeContentBrowserClient::BrowserURLHandlerCreated( 2396 void ChromeContentBrowserClient::BrowserURLHandlerCreated(
2390 BrowserURLHandler* handler) { 2397 BrowserURLHandler* handler) {
2391 for (size_t i = 0; i < extra_parts_.size(); ++i) 2398 for (size_t i = 0; i < extra_parts_.size(); ++i)
2392 extra_parts_[i]->BrowserURLHandlerCreated(handler); 2399 extra_parts_[i]->BrowserURLHandlerCreated(handler);
2393 2400
(...skipping 506 matching lines...) Expand 10 before | Expand all | Expand 10 after
2900 if (channel <= kMaxDisableEncryptionChannel) { 2907 if (channel <= kMaxDisableEncryptionChannel) {
2901 static const char* const kWebRtcDevSwitchNames[] = { 2908 static const char* const kWebRtcDevSwitchNames[] = {
2902 switches::kDisableWebRtcEncryption, 2909 switches::kDisableWebRtcEncryption,
2903 }; 2910 };
2904 to_command_line->CopySwitchesFrom(from_command_line, 2911 to_command_line->CopySwitchesFrom(from_command_line,
2905 kWebRtcDevSwitchNames, 2912 kWebRtcDevSwitchNames,
2906 arraysize(kWebRtcDevSwitchNames)); 2913 arraysize(kWebRtcDevSwitchNames));
2907 } 2914 }
2908 } 2915 }
2909 #endif // defined(ENABLE_WEBRTC) 2916 #endif // defined(ENABLE_WEBRTC)
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-data-saver.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698