Refactor extension event distribution to use Values instead of JSON strings.

chrome/browser/extensions/extension_input_ime_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/extension_input_ime_api.h"
 
 #include "base/json/json_writer.h"
 #include "base/stl_util.h"
 #include "base/string_number_conversions.h"
 #include "base/values.h"
@@ skipping 137 matching lines @@
     extension_id_(extension_id),
     engine_id_(engine_id) {
   }
 
   virtual ~ImeObserver() {}
 
   virtual void OnActivate(const std::string& engine_id) {
     if (profile_ == NULL || extension_id_.empty())
       return;
 
-    ListValue args;
-    args.Append(Value::CreateStringValue(engine_id));
+    ListValue* args = new ListValue();
+    args->Append(Value::CreateStringValue(engine_id));
 
-    std::string json_args;
-    base::JSONWriter::Write(&args, &json_args);
     profile_->GetExtensionEventRouter()->DispatchEventToExtension(
-        extension_id_, events::kOnActivate, json_args, profile_, GURL());
+        extension_id_, events::kOnActivate, args, profile_, GURL());
   }
 
   virtual void OnDeactivated(const std::string& engine_id) {
     if (profile_ == NULL || extension_id_.empty())
       return;
 
-    ListValue args;
-    args.Append(Value::CreateStringValue(engine_id));
+    ListValue* args = new ListValue();
+    args->Append(Value::CreateStringValue(engine_id));
 
-    std::string json_args;
-    base::JSONWriter::Write(&args, &json_args);
     profile_->GetExtensionEventRouter()->DispatchEventToExtension(
-        extension_id_, events::kOnDeactivated, json_args, profile_, GURL());
+        extension_id_, events::kOnDeactivated, args, profile_, GURL());
   }
 
   virtual void OnFocus(const InputMethodEngine::InputContext& context) {
     if (profile_ == NULL || extension_id_.empty())
       return;
 
     DictionaryValue* dict = new DictionaryValue();
     dict->SetInteger("contextID", context.id);
     dict->SetString("type", context.type);
 
-    ListValue args;
-    args.Append(dict);
+    ListValue* args = new ListValue();
+    args->Append(dict);
 
-    std::string json_args;
-    base::JSONWriter::Write(&args, &json_args);
     profile_->GetExtensionEventRouter()->DispatchEventToExtension(
-        extension_id_, events::kOnFocus, json_args, profile_, GURL());
+        extension_id_, events::kOnFocus, args, profile_, GURL());
   }
 
   virtual void OnBlur(int context_id) {
     if (profile_ == NULL || extension_id_.empty())
       return;
 
-    ListValue args;
-    args.Append(Value::CreateIntegerValue(context_id));
+    ListValue* args = new ListValue();
+    args->Append(Value::CreateIntegerValue(context_id));
 
-    std::string json_args;
-    base::JSONWriter::Write(&args, &json_args);
     profile_->GetExtensionEventRouter()->DispatchEventToExtension(
-        extension_id_, events::kOnBlur, json_args, profile_, GURL());
+        extension_id_, events::kOnBlur, args, profile_, GURL());
   }
 
   virtual void OnInputContextUpdate(
       const InputMethodEngine::InputContext& context) {
     if (profile_ == NULL || extension_id_.empty())
       return;
 
     DictionaryValue* dict = new DictionaryValue();
     dict->SetInteger("contextID", context.id);
     dict->SetString("type", context.type);
 
-    ListValue args;
-    args.Append(dict);
+    ListValue* args = new ListValue();
+    args->Append(dict);
 
-    std::string json_args;
-    base::JSONWriter::Write(&args, &json_args);
     profile_->GetExtensionEventRouter()->DispatchEventToExtension(
-        extension_id_, events::kOnInputContextUpdate, json_args, profile_,
-        GURL());
+        extension_id_, events::kOnInputContextUpdate, args, profile_, GURL());
   }
 
   virtual void OnKeyEvent(const std::string& engine_id,
                           const InputMethodEngine::KeyboardEvent& event,
                           chromeos::input_method::KeyEventHandle* key_data) {
     if (profile_ == NULL || extension_id_.empty())
       return;
 
     std::string request_id =
         ExtensionInputImeEventRouter::GetInstance()->AddRequest(engine_id,
                                                                 key_data);
 
     DictionaryValue* dict = new DictionaryValue();
     dict->SetString("type", event.type);
     dict->SetString("requestId", request_id);
     dict->SetString("key", event.key);
     dict->SetBoolean("altKey", event.alt_key);
     dict->SetBoolean("ctrlKey", event.ctrl_key);
     dict->SetBoolean("shiftKey", event.shift_key);
 
-    ListValue args;
-    args.Append(Value::CreateStringValue(engine_id));
-    args.Append(dict);
+    ListValue* args = new ListValue();
+    args->Append(Value::CreateStringValue(engine_id));
+    args->Append(dict);
 
-    std::string json_args;
-    base::JSONWriter::Write(&args, &json_args);
     profile_->GetExtensionEventRouter()->DispatchEventToExtension(
-        extension_id_, events::kOnKeyEvent, json_args, profile_, GURL());
+        extension_id_, events::kOnKeyEvent, args, profile_, GURL());
   }
 
   virtual void OnCandidateClicked(
       const std::string& engine_id,
       int candidate_id,
       chromeos::InputMethodEngine::MouseButtonEvent button) {
     if (profile_ == NULL || extension_id_.empty())
       return;
 
-    ListValue args;
-    args.Append(Value::CreateStringValue(engine_id));
-    args.Append(Value::CreateIntegerValue(candidate_id));
+    ListValue* args = new ListValue();
+    args->Append(Value::CreateStringValue(engine_id));
+    args->Append(Value::CreateIntegerValue(candidate_id));
     switch (button) {
       case chromeos::InputMethodEngine::MOUSE_BUTTON_MIDDLE:
-        args.Append(Value::CreateStringValue("middle"));
+        args->Append(Value::CreateStringValue("middle"));
         break;
 
       case chromeos::InputMethodEngine::MOUSE_BUTTON_RIGHT:
-        args.Append(Value::CreateStringValue("right"));
+        args->Append(Value::CreateStringValue("right"));
         break;
 
       case chromeos::InputMethodEngine::MOUSE_BUTTON_LEFT:
       // Default to left.
       default:
-        args.Append(Value::CreateStringValue("left"));
+        args->Append(Value::CreateStringValue("left"));
         break;
     }
 
-    std::string json_args;
-    base::JSONWriter::Write(&args, &json_args);
     profile_->GetExtensionEventRouter()->DispatchEventToExtension(
-        extension_id_, events::kOnCandidateClicked, json_args, profile_,
-        GURL());
+        extension_id_, events::kOnCandidateClicked, args, profile_, GURL());
   }
 
   virtual void OnMenuItemActivated(const std::string& engine_id,
                                    const std::string& menu_id) {
     if (profile_ == NULL || extension_id_.empty())
       return;
 
-    ListValue args;
-    args.Append(Value::CreateStringValue(engine_id));
-    args.Append(Value::CreateStringValue(menu_id));
+    ListValue* args = new ListValue();
+    args->Append(Value::CreateStringValue(engine_id));
+    args->Append(Value::CreateStringValue(menu_id));
 
-    std::string json_args;
-    base::JSONWriter::Write(&args, &json_args);
     profile_->GetExtensionEventRouter()->DispatchEventToExtension(
-        extension_id_, events::kOnMenuItemActivated, json_args, profile_,
-        GURL());
+        extension_id_, events::kOnMenuItemActivated, args, profile_, GURL());
   }
 
  private:
   Profile* profile_;
   std::string extension_id_;
   std::string engine_id_;
 
   DISALLOW_COPY_AND_ASSIGN(ImeObserver);
 };
 
@@ skipping 514 matching lines @@
 
   bool handled = false;
   EXTENSION_FUNCTION_VALIDATE(args_->GetBoolean(1, &handled));
 
   ExtensionInputImeEventRouter::GetInstance()->OnEventHandled(
       extension_id(), request_id_str, handled);
 
   return true;
 }
 #endif