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 1828 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1839 const std::vector<std::pair<int, int> >& render_frames) { | 1839 const std::vector<std::pair<int, int> >& render_frames) { |
1840 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 1840 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
1841 ProfileIOData* io_data = ProfileIOData::FromResourceContext(context); | 1841 ProfileIOData* io_data = ProfileIOData::FromResourceContext(context); |
1842 CookieSettings* cookie_settings = io_data->GetCookieSettings(); | 1842 CookieSettings* cookie_settings = io_data->GetCookieSettings(); |
1843 bool allow = cookie_settings->IsSettingCookieAllowed(url, url); | 1843 bool allow = cookie_settings->IsSettingCookieAllowed(url, url); |
1844 | 1844 |
1845 // Record access to file system for potential display in UI. | 1845 // Record access to file system for potential display in UI. |
1846 std::vector<std::pair<int, int> >::const_iterator i; | 1846 std::vector<std::pair<int, int> >::const_iterator i; |
1847 for (i = render_frames.begin(); i != render_frames.end(); ++i) { | 1847 for (i = render_frames.begin(); i != render_frames.end(); ++i) { |
1848 BrowserThread::PostTask( | 1848 BrowserThread::PostTask( |
1849 BrowserThread::UI, FROM_HERE, | 1849 BrowserThread::UI, |
1850 FROM_HERE, | |
1850 base::Bind(&TabSpecificContentSettings::FileSystemAccessed, | 1851 base::Bind(&TabSpecificContentSettings::FileSystemAccessed, |
1851 i->first, i->second, url, !allow)); | 1852 i->first, |
fsamuel
2014/05/30 15:13:21
Revert this change.
Xi Han
2014/05/30 18:15:56
Done.
| |
1853 i->second, | |
1854 url, | |
1855 !allow)); | |
1852 } | 1856 } |
1853 | 1857 |
1854 return allow; | 1858 return allow; |
1855 } | 1859 } |
1856 | 1860 |
1857 bool ChromeContentBrowserClient::AllowWorkerIndexedDB( | 1861 bool ChromeContentBrowserClient::AllowWorkerIndexedDB( |
1858 const GURL& url, | 1862 const GURL& url, |
1859 const base::string16& name, | 1863 const base::string16& name, |
1860 content::ResourceContext* context, | 1864 content::ResourceContext* context, |
1861 const std::vector<std::pair<int, int> >& render_frames) { | 1865 const std::vector<std::pair<int, int> >& render_frames) { |
(...skipping 893 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2755 switches::kDisableWebRtcEncryption, | 2759 switches::kDisableWebRtcEncryption, |
2756 }; | 2760 }; |
2757 to_command_line->CopySwitchesFrom(from_command_line, | 2761 to_command_line->CopySwitchesFrom(from_command_line, |
2758 kWebRtcDevSwitchNames, | 2762 kWebRtcDevSwitchNames, |
2759 arraysize(kWebRtcDevSwitchNames)); | 2763 arraysize(kWebRtcDevSwitchNames)); |
2760 } | 2764 } |
2761 } | 2765 } |
2762 #endif // defined(ENABLE_WEBRTC) | 2766 #endif // defined(ENABLE_WEBRTC) |
2763 | 2767 |
2764 } // namespace chrome | 2768 } // namespace chrome |
OLD | NEW |