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

Unified Diff: chrome/browser/extensions/extension_prefs.cc

Issue 12314164: Modified Omnibox extension api to use JSON Schema Compiler (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: kalman's requests Created 7 years, 9 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/extension_prefs.cc
diff --git a/chrome/browser/extensions/extension_prefs.cc b/chrome/browser/extensions/extension_prefs.cc
index 0f1d7439e067f7f646fecc3591523c1644dd483d..1595dfd9b842c949793be38b74602eb6ac435626 100644
--- a/chrome/browser/extensions/extension_prefs.cc
+++ b/chrome/browser/extensions/extension_prefs.cc
@@ -1143,22 +1143,24 @@ void ExtensionPrefs::GetSavedFileEntries(
}
}
-ExtensionOmniboxSuggestion
+scoped_ptr<api::omnibox::SuggestResult>
ExtensionPrefs::GetOmniboxDefaultSuggestion(const std::string& extension_id) {
- ExtensionOmniboxSuggestion suggestion;
+ scoped_ptr<api::omnibox::SuggestResult> suggestion;
const DictionaryValue* extension = GetExtensionPref(extension_id);
const DictionaryValue* dict = NULL;
- if (extension && extension->GetDictionary(kOmniboxDefaultSuggestion, &dict))
- suggestion.Populate(*dict, false);
+ if (extension && extension->GetDictionary(kOmniboxDefaultSuggestion, &dict)) {
+ suggestion.reset(new api::omnibox::SuggestResult);
+ api::omnibox::SuggestResult::Populate(*dict, suggestion.get());
+ }
- return suggestion;
+ return suggestion.Pass();
}
void ExtensionPrefs::SetOmniboxDefaultSuggestion(
const std::string& extension_id,
- const ExtensionOmniboxSuggestion& suggestion) {
- scoped_ptr<base::DictionaryValue> dict = suggestion.ToValue().Pass();
+ const api::omnibox::SuggestResult& suggestion) {
+ scoped_ptr<base::DictionaryValue> dict = suggestion.ToValue();
not at google - send to devlin 2013/03/22 17:33:30 I guess if you change omnibox.json you'd need to d
Aaron Jacobs 2013/03/22 19:54:15 Done.
UpdateExtensionPref(extension_id, kOmniboxDefaultSuggestion, dict.release());
}

Powered by Google App Engine
This is Rietveld 408576698