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

Side by Side Diff: chrome/browser/in_process_webkit/storage_namespace.cc

Issue 387020: Upstreaming WebKit.gyp (Closed)
Patch Set: Created 11 years, 1 month 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. Use of this 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. Use of this
2 // source code is governed by a BSD-style license that can be found in the 2 // source code is governed by a BSD-style license that can be found in the
3 // LICENSE file. 3 // LICENSE file.
4 4
5 #include "chrome/browser/in_process_webkit/storage_namespace.h" 5 #include "chrome/browser/in_process_webkit/storage_namespace.h"
6 6
7 #include "base/file_path.h" 7 #include "base/file_path.h"
8 #include "chrome/browser/in_process_webkit/dom_storage_context.h" 8 #include "chrome/browser/in_process_webkit/dom_storage_context.h"
9 #include "chrome/browser/in_process_webkit/dom_storage_dispatcher_host.h" 9 #include "chrome/browser/in_process_webkit/dom_storage_dispatcher_host.h"
10 #include "chrome/browser/in_process_webkit/storage_area.h" 10 #include "chrome/browser/in_process_webkit/storage_area.h"
11 #include "webkit/api/public/WebStorageArea.h" 11 #include "third_party/WebKit/WebKit/chromium/public/WebStorageArea.h"
12 #include "webkit/api/public/WebStorageNamespace.h" 12 #include "third_party/WebKit/WebKit/chromium/public/WebStorageNamespace.h"
13 #include "webkit/glue/webkit_glue.h" 13 #include "webkit/glue/webkit_glue.h"
14 14
15 using WebKit::WebStorageArea; 15 using WebKit::WebStorageArea;
16 using WebKit::WebStorageNamespace; 16 using WebKit::WebStorageNamespace;
17 using WebKit::WebString; 17 using WebKit::WebString;
18 18
19 /* static */ 19 /* static */
20 StorageNamespace* StorageNamespace::CreateLocalStorageNamespace( 20 StorageNamespace* StorageNamespace::CreateLocalStorageNamespace(
21 DOMStorageContext* dom_storage_context, const FilePath& data_dir_path) { 21 DOMStorageContext* dom_storage_context, const FilePath& data_dir_path) {
22 int64 id = dom_storage_context->kLocalStorageNamespaceId; 22 int64 id = dom_storage_context->kLocalStorageNamespaceId;
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 100
101 if (dom_storage_type_ == DOM_STORAGE_LOCAL) { 101 if (dom_storage_type_ == DOM_STORAGE_LOCAL) {
102 storage_namespace_.reset( 102 storage_namespace_.reset(
103 WebStorageNamespace::createLocalStorageNamespace(data_dir_path_, 103 WebStorageNamespace::createLocalStorageNamespace(data_dir_path_,
104 kLocalStorageQuota)); 104 kLocalStorageQuota));
105 } else { 105 } else {
106 storage_namespace_.reset( 106 storage_namespace_.reset(
107 WebStorageNamespace::createSessionStorageNamespace()); 107 WebStorageNamespace::createSessionStorageNamespace());
108 } 108 }
109 } 109 }
OLDNEW
« no previous file with comments | « chrome/browser/in_process_webkit/storage_namespace.h ('k') | chrome/browser/in_process_webkit/webkit_thread.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698