OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/in_process_webkit/dom_storage_area.h" | 5 #include "chrome/browser/in_process_webkit/dom_storage_area.h" |
6 | 6 |
7 #include "base/task.h" | 7 #include "base/task.h" |
8 #include "chrome/browser/browser_thread.h" | 8 #include "chrome/browser/browser_thread.h" |
| 9 #include "chrome/browser/content_settings/host_content_settings_map.h" |
9 #include "chrome/browser/in_process_webkit/dom_storage_context.h" | 10 #include "chrome/browser/in_process_webkit/dom_storage_context.h" |
10 #include "chrome/browser/in_process_webkit/dom_storage_dispatcher_host.h" | 11 #include "chrome/browser/in_process_webkit/dom_storage_dispatcher_host.h" |
11 #include "chrome/browser/in_process_webkit/dom_storage_namespace.h" | 12 #include "chrome/browser/in_process_webkit/dom_storage_namespace.h" |
12 #include "chrome/browser/host_content_settings_map.h" | |
13 #include "chrome/common/render_messages.h" | 13 #include "chrome/common/render_messages.h" |
14 #include "third_party/WebKit/WebKit/chromium/public/WebSecurityOrigin.h" | 14 #include "third_party/WebKit/WebKit/chromium/public/WebSecurityOrigin.h" |
15 #include "third_party/WebKit/WebKit/chromium/public/WebStorageArea.h" | 15 #include "third_party/WebKit/WebKit/chromium/public/WebStorageArea.h" |
16 #include "third_party/WebKit/WebKit/chromium/public/WebString.h" | 16 #include "third_party/WebKit/WebKit/chromium/public/WebString.h" |
17 #include "third_party/WebKit/WebKit/chromium/public/WebURL.h" | 17 #include "third_party/WebKit/WebKit/chromium/public/WebURL.h" |
18 #include "webkit/glue/webkit_glue.h" | 18 #include "webkit/glue/webkit_glue.h" |
19 | 19 |
20 using WebKit::WebSecurityOrigin; | 20 using WebKit::WebSecurityOrigin; |
21 using WebKit::WebStorageArea; | 21 using WebKit::WebStorageArea; |
22 using WebKit::WebString; | 22 using WebKit::WebString; |
(...skipping 69 matching lines...) Loading... |
92 } | 92 } |
93 | 93 |
94 bool DOMStorageArea::CheckContentSetting( | 94 bool DOMStorageArea::CheckContentSetting( |
95 const string16& key, const string16& value, | 95 const string16& key, const string16& value, |
96 DOMStorageDispatcherHost* sender) { | 96 DOMStorageDispatcherHost* sender) { |
97 ContentSetting content_setting = | 97 ContentSetting content_setting = |
98 host_content_settings_map_->GetContentSetting( | 98 host_content_settings_map_->GetContentSetting( |
99 origin_url_, CONTENT_SETTINGS_TYPE_COOKIES, ""); | 99 origin_url_, CONTENT_SETTINGS_TYPE_COOKIES, ""); |
100 return (content_setting != CONTENT_SETTING_BLOCK); | 100 return (content_setting != CONTENT_SETTING_BLOCK); |
101 } | 101 } |
OLD | NEW |