summaryrefslogtreecommitdiffstats
path: root/content/utility/utility_thread_impl.h
diff options
context:
space:
mode:
authorjsbell@chromium.org <jsbell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-30 20:18:27 +0000
committerjsbell@chromium.org <jsbell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-30 20:18:27 +0000
commit67a85dba124f3a447d69f9144ff45f3f465e1599 (patch)
tree7b5af8c3e25a567d9f85911219f3ed82e422d6bd /content/utility/utility_thread_impl.h
parent5d606079f2f32139bf5116a21e78338314c2b918 (diff)
downloadchromium_src-67a85dba124f3a447d69f9144ff45f3f465e1599.zip
chromium_src-67a85dba124f3a447d69f9144ff45f3f465e1599.tar.gz
chromium_src-67a85dba124f3a447d69f9144ff45f3f465e1599.tar.bz2
Use WebIDBKeyPath type in WebKit API, implement IndexedDBKeyPath type.
IndexedDB allows key paths to be strings or arrays of strings (or null, for object stores). Implement the new WebKit API that uses a dedicated type instead of strings, and implement appropriate IPC plumbing. This change is dependent on: https://webkit.org/b/84631 R=darin@chromium.org,tkent@chromium.org,dgrogan@chromium.org,michaeln@chromium.org BUG=112308 Review URL: http://codereview.chromium.org/10204003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134581 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/utility/utility_thread_impl.h')
-rw-r--r--content/utility/utility_thread_impl.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/content/utility/utility_thread_impl.h b/content/utility/utility_thread_impl.h
index b0c20a2..eba5add 100644
--- a/content/utility/utility_thread_impl.h
+++ b/content/utility/utility_thread_impl.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -11,7 +11,6 @@
#include "base/basictypes.h"
#include "base/compiler_specific.h"
-#include "base/string16.h"
#include "content/common/child_thread.h"
#include "content/common/content_export.h"
#include "content/public/utility/utility_thread.h"
@@ -20,6 +19,7 @@ class FilePath;
class IndexedDBKey;
namespace content {
+class IndexedDBKeyPath;
class SerializedScriptValue;
class WebKitPlatformSupportImpl;
}
@@ -47,10 +47,10 @@ class UtilityThreadImpl : public content::UtilityThread,
int id,
const std::vector<content::SerializedScriptValue>&
serialized_script_values,
- const string16& idb_key_path);
+ const content::IndexedDBKeyPath& idb_key_path);
void OnInjectIDBKey(const IndexedDBKey& key,
const content::SerializedScriptValue& value,
- const string16& key_path);
+ const content::IndexedDBKeyPath& key_path);
void OnBatchModeStarted();
void OnBatchModeFinished();