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

Unified Diff: chrome/browser/extensions/api/storage/settings_frontend.cc

Issue 175853002: Revert of Add a Restore() method to ValueStore and make StorageAPI use it (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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: chrome/browser/extensions/api/storage/settings_frontend.cc
diff --git a/chrome/browser/extensions/api/storage/settings_frontend.cc b/chrome/browser/extensions/api/storage/settings_frontend.cc
index c4b005035d16e3128aef489c4d87a8759df78853..45154ffce64f1b501ea5b7ce55c775ab3427eef0 100644
--- a/chrome/browser/extensions/api/storage/settings_frontend.cc
+++ b/chrome/browser/extensions/api/storage/settings_frontend.cc
@@ -11,6 +11,7 @@
#include "base/files/file_path.h"
#include "base/json/json_reader.h"
#include "chrome/browser/extensions/api/storage/leveldb_settings_storage_factory.h"
+#include "chrome/browser/extensions/api/storage/settings_backend.h"
#include "chrome/browser/extensions/api/storage/sync_or_local_value_store_cache.h"
#include "chrome/browser/extensions/event_names.h"
#include "chrome/browser/extensions/extension_service.h"
@@ -145,8 +146,15 @@
DCHECK(it != caches_.end());
const SyncOrLocalValueStoreCache* sync_cache =
static_cast<const SyncOrLocalValueStoreCache*>(it->second);
- DCHECK(type == syncer::APP_SETTINGS || type == syncer::EXTENSION_SETTINGS);
- return sync_cache->GetSyncableService(type);
+ switch (type) {
+ case syncer::APP_SETTINGS:
+ return sync_cache->GetAppBackend();
+ case syncer::EXTENSION_SETTINGS:
+ return sync_cache->GetExtensionBackend();
+ default:
+ NOTREACHED();
+ return NULL;
+ }
}
bool SettingsFrontend::IsStorageEnabled(

Powered by Google App Engine
This is Rietveld 408576698