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

Unified Diff: content/browser/in_process_webkit/dom_storage_context_impl.cc

Issue 9467016: Get rid of WebKitContext. Only two out of six HTML5 related objects were in it and it was just a gl… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix bug Created 8 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/in_process_webkit/dom_storage_context_impl.cc
===================================================================
--- content/browser/in_process_webkit/dom_storage_context_impl.cc (revision 123509)
+++ content/browser/in_process_webkit/dom_storage_context_impl.cc (working copy)
@@ -12,16 +12,13 @@
#include "base/string_util.h"
#include "content/browser/in_process_webkit/dom_storage_area.h"
#include "content/browser/in_process_webkit/dom_storage_namespace.h"
-#include "content/browser/in_process_webkit/webkit_context.h"
#include "content/common/dom_storage_common.h"
-#include "content/public/browser/browser_context.h"
#include "content/public/browser/browser_thread.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
#include "webkit/glue/webkit_glue.h"
#include "webkit/quota/special_storage_policy.h"
-using content::BrowserContext;
using content::BrowserThread;
using content::DOMStorageContext;
using WebKit::WebSecurityOrigin;
@@ -59,13 +56,8 @@
} // namespace
-DOMStorageContext* DOMStorageContext::GetForBrowserContext(
- BrowserContext* context) {
- return BrowserContext::GetWebKitContext(context)->dom_storage_context();
-}
-
DOMStorageContextImpl::DOMStorageContextImpl(
- WebKitContext* webkit_context,
+ const FilePath& data_path,
quota::SpecialStoragePolicy* special_storage_policy)
: last_storage_area_id_(0),
last_session_storage_namespace_id_on_ui_thread_(kLocalStorageNamespaceId),
@@ -73,7 +65,7 @@
clear_local_state_on_exit_(false),
save_session_state_(false),
special_storage_policy_(special_storage_policy) {
- data_path_ = webkit_context->data_path();
+ data_path_ = data_path;
}
DOMStorageContextImpl::~DOMStorageContextImpl() {

Powered by Google App Engine
This is Rietveld 408576698