Modified Omnibox extension api to use JSON Schema Compiler

chrome/browser/extensions/api/omnibox/omnibox_api.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/api/omnibox/omnibox_api.h"
 
 #include "base/json/json_writer.h"
 #include "base/lazy_instance.h"
 #include "base/metrics/histogram.h"
 #include "base/string16.h"
@@ skipping 10 matching lines @@
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/api/omnibox/omnibox_handler.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
 #include "chrome/common/extensions/manifest_handler.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "ui/gfx/image/image.h"
 
+namespace SendSuggestions = extensions::api::omnibox::SendSuggestions;
+
 namespace events {
 const char kOnInputStarted[] = "omnibox.onInputStarted";
 const char kOnInputChanged[] = "omnibox.onInputChanged";
 const char kOnInputEntered[] = "omnibox.onInputEntered";
 const char kOnInputCancelled[] = "omnibox.onInputCancelled";
 }  // namespace events
 
 namespace extensions {
 
 namespace {
@@ skipping 176 matching lines @@
       omnibox_icon_manager_.GetIcon(extension_id));
 }
 
 gfx::Image OmniboxAPI::GetOmniboxPopupIcon(const std::string& extension_id) {
   return gfx::Image::CreateFrom1xBitmap(
       omnibox_popup_icon_manager_.GetIcon(extension_id));
 }
 
 bool OmniboxSendSuggestionsFunction::RunImpl() {
   ExtensionOmniboxSuggestions suggestions;
-  ListValue* suggestions_value;
-  EXTENSION_FUNCTION_VALIDATE(args_->GetInteger(0, &suggestions.request_id));
-  EXTENSION_FUNCTION_VALIDATE(args_->GetList(1, &suggestions_value));
+  scoped_ptr<SendSuggestions::Params> params(
+    SendSuggestions::Params::Create(*args_));

[Devlin, 2013/02/27 22:14:17]

Line continuation has 4-space indentation.

[Aaron Jacobs, 2013/02/27 23:01:58]

Done.

+  EXTENSION_FUNCTION_VALIDATE(params.get());
 
-  suggestions.suggestions.resize(suggestions_value->GetSize());
-  for (size_t i = 0; i < suggestions_value->GetSize(); ++i) {
+  suggestions.request_id = params->request_id;
+  std::vector<linked_ptr<

[Devlin, 2013/02/27 22:14:17]

yeah, this is another ugly line.  But I think it might look at least a little
better as

std::vector<linked_ptr<SendSuggestions::Params::SuggestResultsType> > 
    suggest_results = params->suggest_results;

[Aaron Jacobs, 2013/02/27 23:01:58]

Done.

+      SendSuggestions::Params::SuggestResultsType> > suggest_results =
+          params->suggest_results;
+
+  suggestions.suggestions.resize(suggest_results.size());
+  for (size_t i = 0; i < suggest_results.size(); ++i) {
     ExtensionOmniboxSuggestion& suggestion = suggestions.suggestions[i];
-    DictionaryValue* suggestion_value;
-    EXTENSION_FUNCTION_VALIDATE(suggestions_value->GetDictionary(
-        i, &suggestion_value));
-    EXTENSION_FUNCTION_VALIDATE(suggestion.Populate(*suggestion_value, true));
+
+    EXTENSION_FUNCTION_VALIDATE(suggestion.Populate(
+        suggest_results.at(i)->additional_properties, true));
   }
 
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_EXTENSION_OMNIBOX_SUGGESTIONS_READY,
       content::Source<Profile>(profile_->GetOriginalProfile()),
       content::Details<ExtensionOmniboxSuggestions>(&suggestions));
 
   return true;
 }
 
 bool OmniboxSetDefaultSuggestionFunction::RunImpl() {
   ExtensionOmniboxSuggestion suggestion;
-  DictionaryValue* suggestion_value;
-  EXTENSION_FUNCTION_VALIDATE(args_->GetDictionary(0, &suggestion_value));
-  EXTENSION_FUNCTION_VALIDATE(suggestion.Populate(*suggestion_value, false));
+  scoped_ptr<SetDefaultSuggestion::Params> params(
+    SetDefaultSuggestion::Params::Create(*args_));
+  EXTENSION_FUNCTION_VALIDATE(params.get());
+
+  EXTENSION_FUNCTION_VALIDATE(
+      suggestion.PopulateFromSuggestion(params->suggestion));
 
   ExtensionPrefs* prefs =
       ExtensionSystem::Get(profile())->extension_service()->extension_prefs();
   if (prefs)
     prefs->SetOmniboxDefaultSuggestion(extension_id(), suggestion);
 
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_EXTENSION_OMNIBOX_DEFAULT_SUGGESTION_CHANGED,
       content::Source<Profile>(profile_->GetOriginalProfile()),
       content::NotificationService::NoDetails());
@@ skipping 40 matching lines @@
       description_styles.push_back(ACMatchClassification(offset, type));
     }
   } else {
     description_styles.push_back(
         ACMatchClassification(0, ACMatchClassification::NONE));
   }
 
   return true;
 }
 
+bool ExtensionOmniboxSuggestion::PopulateFromSuggestion(

[Devlin, 2013/02/27 22:14:17]

Perhaps better as PopulateFromDefaultSuggestion, since the DefaultSuggestion is
the only one that contains the description and nothing else?

[Aaron Jacobs, 2013/02/27 23:01:58]

Done.

+    const SetDefaultSuggestion::Params::Suggestion& suggestion) {
+  description_styles.clear();
+  description_styles.push_back(
+      ACMatchClassification(0, ACMatchClassification::NONE));
+
+  EXTENSION_FUNCTION_VALIDATE(UTF8ToUTF16(suggestion.description.c_str(),

[Devlin, 2013/02/27 22:14:17]

Change to
description = UTF8ToUTF16(suggestion.description);

[Aaron Jacobs, 2013/02/27 23:01:58]

Done.

+                                          suggestion.description.length(),
+                                          &description));
+
+  return true;
+}
+
 bool ExtensionOmniboxSuggestion::ReadStylesFromValue(
     const ListValue& styles_value) {
   description_styles.clear();
 
   // Step 1: Build a vector of styles, 1 per character of description text.
   std::vector<int> styles;
   styles.resize(description.length());  // sets all styles to 0
 
   for (size_t i = 0; i < styles_value.GetSize(); ++i) {
     const DictionaryValue* style;
@@ skipping 93 matching lines @@
     for (size_t i = 0; i < description_styles.size(); ++i) {
       if (description_styles[i].offset > placeholder)
         description_styles[i].offset += replacement.length() - 2;
     }
   }
 
   match->contents.assign(description);
 }
 
 }  // namespace extensions