Change ManifestHandler interface to always (implicitly) pass the entire manifest to handlers.

This makes it possible to support multi-key handlers using the same interface.
Fixes a bug with default behavior for manifest handlers; previously, HasNoKey would be called even for inappropriate extension types.

BUG=159265


Review URL: https://chromiumcodereview.appspot.com/12084034

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@179470 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 4 deletions

diff --git a/chrome/common/extensions/api/omnibox/omnibox_handler.cc b/chrome/common/extensions/api/omnibox/omnibox_handler.cc
index 287021dd..32c4069 100644
--- a/chrome/common/extensions/api/omnibox/omnibox_handler.cc
+++ b/chrome/common/extensions/api/omnibox/omnibox_handler.cc
@@ -12,6 +12,7 @@
 #include "chrome/common/extensions/api/extension_action/action_info.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
+#include "chrome/common/extensions/manifest.h"
 
 namespace extensions {
 
@@ -44,12 +45,11 @@ OmniboxHandler::OmniboxHandler() {
 OmniboxHandler::~OmniboxHandler() {
 }
 
-bool OmniboxHandler::Parse(const base::Value* value,
-                           Extension* extension,
-                           string16* error) {
+bool OmniboxHandler::Parse(Extension* extension, string16* error) {
   scoped_ptr<OmniboxInfo> info(new OmniboxInfo);
   const DictionaryValue* dict = NULL;
-  if (!value->GetAsDictionary(&dict) ||
+  if (!extension->manifest()->GetDictionary(extension_manifest_keys::kOmnibox,
+                                            &dict) ||
       !dict->GetString(kKeyword, &info->keyword) ||
       info->keyword.empty()) {
     *error = ASCIIToUTF16(extension_manifest_errors::kInvalidOmniboxKeyword);