summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/extensions/extension_event_names.cc2
-rw-r--r--chrome/browser/extensions/settings/settings_api.h10
-rw-r--r--chrome/browser/extensions/settings/settings_frontend.cc4
-rw-r--r--chrome/browser/extensions/settings/settings_frontend.h2
-rw-r--r--chrome/browser/extensions/settings/settings_namespace.h4
5 files changed, 11 insertions, 11 deletions
diff --git a/chrome/browser/extensions/extension_event_names.cc b/chrome/browser/extensions/extension_event_names.cc
index 9f25a7a..c5c55b7 100644
--- a/chrome/browser/extensions/extension_event_names.cc
+++ b/chrome/browser/extensions/extension_event_names.cc
@@ -38,7 +38,7 @@ const char kOnDownloadCreated[] = "experimental.downloads.onCreated";
const char kOnDownloadChanged[] = "experimental.downloads.onChanged";
const char kOnDownloadErased[] = "experimental.downloads.onErased";
-const char kOnSettingsChanged[] = "storage.onChanged";
+const char kOnSettingsChanged[] = "experimental.storage.onChanged";
const char kOnTerminalProcessOutput[] = "terminalPrivate.onProcessOutput";
diff --git a/chrome/browser/extensions/settings/settings_api.h b/chrome/browser/extensions/settings/settings_api.h
index 1728e9f..116d931 100644
--- a/chrome/browser/extensions/settings/settings_api.h
+++ b/chrome/browser/extensions/settings/settings_api.h
@@ -60,7 +60,7 @@ class SettingsFunction : public AsyncExtensionFunction {
class GetSettingsFunction : public SettingsFunction {
public:
- DECLARE_EXTENSION_FUNCTION_NAME("storage.get");
+ DECLARE_EXTENSION_FUNCTION_NAME("experimental.storage.get");
protected:
virtual bool RunWithStorage(SettingsStorage* storage) OVERRIDE;
@@ -68,7 +68,7 @@ class GetSettingsFunction : public SettingsFunction {
class SetSettingsFunction : public SettingsFunction {
public:
- DECLARE_EXTENSION_FUNCTION_NAME("storage.set");
+ DECLARE_EXTENSION_FUNCTION_NAME("experimental.storage.set");
protected:
virtual bool RunWithStorage(SettingsStorage* storage) OVERRIDE;
@@ -79,7 +79,7 @@ class SetSettingsFunction : public SettingsFunction {
class RemoveSettingsFunction : public SettingsFunction {
public:
- DECLARE_EXTENSION_FUNCTION_NAME("storage.remove");
+ DECLARE_EXTENSION_FUNCTION_NAME("experimental.storage.remove");
protected:
virtual bool RunWithStorage(SettingsStorage* storage) OVERRIDE;
@@ -90,7 +90,7 @@ class RemoveSettingsFunction : public SettingsFunction {
class ClearSettingsFunction : public SettingsFunction {
public:
- DECLARE_EXTENSION_FUNCTION_NAME("storage.clear");
+ DECLARE_EXTENSION_FUNCTION_NAME("experimental.storage.clear");
protected:
virtual bool RunWithStorage(SettingsStorage* storage) OVERRIDE;
@@ -101,7 +101,7 @@ class ClearSettingsFunction : public SettingsFunction {
class GetBytesInUseSettingsFunction : public SettingsFunction {
public:
- DECLARE_EXTENSION_FUNCTION_NAME("storage.getBytesInUse");
+ DECLARE_EXTENSION_FUNCTION_NAME("experimental.storage.getBytesInUse");
protected:
virtual bool RunWithStorage(SettingsStorage* storage) OVERRIDE;
diff --git a/chrome/browser/extensions/settings/settings_frontend.cc b/chrome/browser/extensions/settings/settings_frontend.cc
index 6c5fbed..ddad18b 100644
--- a/chrome/browser/extensions/settings/settings_frontend.cc
+++ b/chrome/browser/extensions/settings/settings_frontend.cc
@@ -102,11 +102,11 @@ size_t GetStringAsInteger(
// Constructs a |Limits| configuration by looking up the QUOTA_BYTES,
// QUOTA_BYTES_PER_ITEM, and MAX_ITEMS properties of a storage area defined
-// in chrome/common/extensions/api/storage.json (via ExtensionAPI).
+// in chrome/common/extensions/api/experimental.storage.json (via ExtensionAPI).
SettingsStorageQuotaEnforcer::Limits GetLimitsFromExtensionAPI(
const std::string& storage_area_id) {
const DictionaryValue* storage_schema =
- ExtensionAPI::GetInstance()->GetSchema("storage");
+ ExtensionAPI::GetInstance()->GetSchema("experimental.storage");
CHECK(storage_schema);
DictionaryValue* properties = NULL;
diff --git a/chrome/browser/extensions/settings/settings_frontend.h b/chrome/browser/extensions/settings/settings_frontend.h
index c651bb2..424701b 100644
--- a/chrome/browser/extensions/settings/settings_frontend.h
+++ b/chrome/browser/extensions/settings/settings_frontend.h
@@ -71,7 +71,7 @@ class SettingsFrontend {
Profile* profile);
// The quota limit configurations for the local and sync areas, taken out of
- // the schema in chrome/common/extensions/api/storage.json.
+ // the schema in chrome/common/extensions/api/experimental.storage.json.
const SettingsStorageQuotaEnforcer::Limits local_quota_limit_;
const SettingsStorageQuotaEnforcer::Limits sync_quota_limit_;
diff --git a/chrome/browser/extensions/settings/settings_namespace.h b/chrome/browser/extensions/settings/settings_namespace.h
index 3b3ce3d..3718a19 100644
--- a/chrome/browser/extensions/settings/settings_namespace.h
+++ b/chrome/browser/extensions/settings/settings_namespace.h
@@ -14,8 +14,8 @@ namespace settings_namespace {
// The namespaces of the storage areas.
enum Namespace {
- LOCAL, // "local" i.e. chrome.storage.local
- SYNC, // "sync" i.e. chrome.storage.sync
+ LOCAL, // "local" i.e. chrome.experimental.storage.local
+ SYNC, // "sync" i.e. chrome.experimental.storage.sync
INVALID
};