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/renderer_host/chrome_render_message_filter.h" | 5 #include "chrome/browser/renderer_host/chrome_render_message_filter.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
177 base::Bind(&TabSpecificContentSettings::WebDatabaseAccessed, | 177 base::Bind(&TabSpecificContentSettings::WebDatabaseAccessed, |
178 render_process_id_, render_frame_id, origin_url, name, | 178 render_process_id_, render_frame_id, origin_url, name, |
179 display_name, !*allowed)); | 179 display_name, !*allowed)); |
180 } | 180 } |
181 | 181 |
182 void ChromeRenderMessageFilter::OnAllowDOMStorage(int render_frame_id, | 182 void ChromeRenderMessageFilter::OnAllowDOMStorage(int render_frame_id, |
183 const GURL& origin_url, | 183 const GURL& origin_url, |
184 const GURL& top_origin_url, | 184 const GURL& top_origin_url, |
185 bool local, | 185 bool local, |
186 bool* allowed) { | 186 bool* allowed) { |
187 *allowed = | 187 // TODO(zork): Decide if we need this. |
188 // We need to put renderer state in IO thread for MimeHandlerViewGuest and | |
189 // we can retrieve whether we need special cooking settings for this | |
190 // {|render_process_id_|, |render_frame_id|} pair. | |
191 *allowed = true; | |
Fady Samuel
2014/09/02 20:30:00
Perhaps we can simply fix this in a separate CL? I
lazyboy
2014/09/02 21:44:22
Reverted this, seems to work still w/o this change
| |
188 cookie_settings_->IsSettingCookieAllowed(origin_url, top_origin_url); | 192 cookie_settings_->IsSettingCookieAllowed(origin_url, top_origin_url); |
189 // Record access to DOM storage for potential display in UI. | 193 // Record access to DOM storage for potential display in UI. |
190 BrowserThread::PostTask( | 194 BrowserThread::PostTask( |
191 BrowserThread::UI, FROM_HERE, | 195 BrowserThread::UI, FROM_HERE, |
192 base::Bind(&TabSpecificContentSettings::DOMStorageAccessed, | 196 base::Bind(&TabSpecificContentSettings::DOMStorageAccessed, |
193 render_process_id_, render_frame_id, origin_url, local, | 197 render_process_id_, render_frame_id, origin_url, local, |
194 !*allowed)); | 198 !*allowed)); |
195 } | 199 } |
196 | 200 |
197 void ChromeRenderMessageFilter::OnRequestFileSystemAccessSync( | 201 void ChromeRenderMessageFilter::OnRequestFileSystemAccessSync( |
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
353 base::Bind(&TabSpecificContentSettings::IndexedDBAccessed, | 357 base::Bind(&TabSpecificContentSettings::IndexedDBAccessed, |
354 render_process_id_, render_frame_id, origin_url, name, | 358 render_process_id_, render_frame_id, origin_url, name, |
355 !*allowed)); | 359 !*allowed)); |
356 } | 360 } |
357 | 361 |
358 #if defined(ENABLE_PLUGINS) | 362 #if defined(ENABLE_PLUGINS) |
359 void ChromeRenderMessageFilter::OnIsCrashReportingEnabled(bool* enabled) { | 363 void ChromeRenderMessageFilter::OnIsCrashReportingEnabled(bool* enabled) { |
360 *enabled = ChromeMetricsServiceAccessor::IsCrashReportingEnabled(); | 364 *enabled = ChromeMetricsServiceAccessor::IsCrashReportingEnabled(); |
361 } | 365 } |
362 #endif | 366 #endif |
OLD | NEW |