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

Unified Diff: chrome/common/extensions/api/omnibox/omnibox_handler.cc

Issue 22794012: Rename extension_manifest_keys namespace to extensions::manifest_keys. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 4 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/common/extensions/api/omnibox/omnibox_handler.cc
diff --git a/chrome/common/extensions/api/omnibox/omnibox_handler.cc b/chrome/common/extensions/api/omnibox/omnibox_handler.cc
index 7b95ac2423dc4187cdddd790ae06413dc14ad943..284db713bc8ba32bc2b5631820c8ef762bc4dfb8 100644
--- a/chrome/common/extensions/api/omnibox/omnibox_handler.cc
+++ b/chrome/common/extensions/api/omnibox/omnibox_handler.cc
@@ -24,7 +24,7 @@ const char kKeyword[] = "keyword";
// static
const std::string& OmniboxInfo::GetKeyword(const Extension* extension) {
OmniboxInfo* info = static_cast<OmniboxInfo*>(
- extension->GetManifestData(extension_manifest_keys::kOmnibox));
+ extension->GetManifestData(manifest_keys::kOmnibox));
return info ? info->keyword : EmptyString();
}
@@ -37,19 +37,19 @@ OmniboxHandler::~OmniboxHandler() {
bool OmniboxHandler::Parse(Extension* extension, string16* error) {
scoped_ptr<OmniboxInfo> info(new OmniboxInfo);
const base::DictionaryValue* dict = NULL;
- if (!extension->manifest()->GetDictionary(extension_manifest_keys::kOmnibox,
+ if (!extension->manifest()->GetDictionary(manifest_keys::kOmnibox,
&dict) ||
!dict->GetString(kKeyword, &info->keyword) ||
info->keyword.empty()) {
*error = ASCIIToUTF16(extension_manifest_errors::kInvalidOmniboxKeyword);
return false;
}
- extension->SetManifestData(extension_manifest_keys::kOmnibox, info.release());
+ extension->SetManifestData(manifest_keys::kOmnibox, info.release());
return true;
}
const std::vector<std::string> OmniboxHandler::Keys() const {
- return SingleKey(extension_manifest_keys::kOmnibox);
+ return SingleKey(manifest_keys::kOmnibox);
}
} // namespace extensions

Powered by Google App Engine
This is Rietveld 408576698