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 <set> | 7 #include <set> |
8 #include <utility> | 8 #include <utility> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 1443 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1454 bool ChromeContentBrowserClient::AllowAppCache( | 1454 bool ChromeContentBrowserClient::AllowAppCache( |
1455 const GURL& manifest_url, | 1455 const GURL& manifest_url, |
1456 const GURL& first_party, | 1456 const GURL& first_party, |
1457 content::ResourceContext* context) { | 1457 content::ResourceContext* context) { |
1458 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 1458 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
1459 ProfileIOData* io_data = ProfileIOData::FromResourceContext(context); | 1459 ProfileIOData* io_data = ProfileIOData::FromResourceContext(context); |
1460 return io_data->GetCookieSettings()-> | 1460 return io_data->GetCookieSettings()-> |
1461 IsSettingCookieAllowed(manifest_url, first_party); | 1461 IsSettingCookieAllowed(manifest_url, first_party); |
1462 } | 1462 } |
1463 | 1463 |
1464 bool ChromeContentBrowserClient::AllowServiceWorker( | |
1465 const GURL& scope, | |
1466 const GURL& document_url, | |
1467 content::ResourceContext* context) { | |
1468 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | |
1469 ProfileIOData* io_data = ProfileIOData::FromResourceContext(context); | |
1470 return io_data->GetCookieSettings()->IsSettingCookieAllowed(scope, | |
michaeln
2014/10/02 20:32:51
nit: maybe use wrapping style consistent with ln 1
falken
2014/10/03 08:30:42
Done (I'd just run git-cl format and didn't check
| |
1471 document_url); | |
michaeln
2014/10/02 20:46:28
The docurl is not a good value for the 2nd param t
falken
2014/10/03 08:30:42
Done.
| |
1472 } | |
1473 | |
1464 bool ChromeContentBrowserClient::AllowGetCookie( | 1474 bool ChromeContentBrowserClient::AllowGetCookie( |
1465 const GURL& url, | 1475 const GURL& url, |
1466 const GURL& first_party, | 1476 const GURL& first_party, |
1467 const net::CookieList& cookie_list, | 1477 const net::CookieList& cookie_list, |
1468 content::ResourceContext* context, | 1478 content::ResourceContext* context, |
1469 int render_process_id, | 1479 int render_process_id, |
1470 int render_frame_id) { | 1480 int render_frame_id) { |
1471 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 1481 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
1472 ProfileIOData* io_data = ProfileIOData::FromResourceContext(context); | 1482 ProfileIOData* io_data = ProfileIOData::FromResourceContext(context); |
1473 bool allow = io_data->GetCookieSettings()-> | 1483 bool allow = io_data->GetCookieSettings()-> |
(...skipping 1160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2634 switches::kDisableWebRtcEncryption, | 2644 switches::kDisableWebRtcEncryption, |
2635 }; | 2645 }; |
2636 to_command_line->CopySwitchesFrom(from_command_line, | 2646 to_command_line->CopySwitchesFrom(from_command_line, |
2637 kWebRtcDevSwitchNames, | 2647 kWebRtcDevSwitchNames, |
2638 arraysize(kWebRtcDevSwitchNames)); | 2648 arraysize(kWebRtcDevSwitchNames)); |
2639 } | 2649 } |
2640 } | 2650 } |
2641 #endif // defined(ENABLE_WEBRTC) | 2651 #endif // defined(ENABLE_WEBRTC) |
2642 | 2652 |
2643 } // namespace chrome | 2653 } // namespace chrome |
OLD | NEW |