Extension API Renaming/Consistency changes

chrome/browser/extensions/extension_browser_event_router.cc

 // Copyright (c) 2009 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_browser_event_router.h"
 
 #include "base/json_writer.h"
 #include "base/values.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/profile.h"
@@ skipping 101 matching lines @@
   initialized_ = true;
 }
 
 ExtensionBrowserEventRouter::ExtensionBrowserEventRouter()
     : initialized_(false) { }
 
 void ExtensionBrowserEventRouter::OnBrowserAdded(const Browser* browser) {
   // Start listening to TabStripModel events for this browser.
   browser->tabstrip_model()->AddObserver(this);
 
-  DispatchSimpleBrowserEvent(browser->profile(),
-                             ExtensionTabUtil::GetWindowId(browser),
-                             events::kOnWindowCreated);
+  ListValue args;
+  // TODO(rafaelw): This would ideally be returning a full Window object
+  // via ExtensionTabUtil::CreateWindowValue(), but the browser->window()
+  // isn't ready at the time we get the OnBrowserAdded event.
+  DictionaryValue* window_dictionary = new DictionaryValue();
+  window_dictionary->SetInteger(extension_tabs_module_constants::kIdKey,
+      ExtensionTabUtil::GetWindowId(browser));
+  args.Append(window_dictionary);
+
+  std::string json_args;
+  JSONWriter::Write(&args, false, &json_args);
+
+  DispatchEvent(browser->profile(), events::kOnWindowCreated, json_args);
 }
 
 void ExtensionBrowserEventRouter::OnBrowserRemoving(const Browser* browser) {
   // Stop listening to TabStripModel events for this browser.
   browser->tabstrip_model()->RemoveObserver(this);
 
   DispatchSimpleBrowserEvent(browser->profile(),
                              ExtensionTabUtil::GetWindowId(browser),
                              events::kOnWindowRemoved);
 }
@@ skipping 195 matching lines @@
 
 void ExtensionBrowserEventRouter::TabStripEmpty() { }
 
 void ExtensionBrowserEventRouter::PageActionExecuted(
     Profile* profile,
     const std::string& extension_id,
     const std::string& page_action_id,
     int tab_id,
     const std::string& url) {
   ListValue args;
-  DictionaryValue* object_args = new DictionaryValue();
-  object_args->Set(tab_keys::kPageActionIdKey,
-                   Value::CreateStringValue(page_action_id));
+
+  args.Append(Value::CreateStringValue(page_action_id));
+
   DictionaryValue* data = new DictionaryValue();
   data->Set(tab_keys::kTabIdKey, Value::CreateIntegerValue(tab_id));
   data->Set(tab_keys::kTabUrlKey, Value::CreateStringValue(url));
-  object_args->Set(tab_keys::kDataKey, data);
 
-  args.Append(object_args);
+  args.Append(data);
 
   std::string json_args;
   JSONWriter::Write(&args, false, &json_args);
 
   std::string event_name = extension_id + std::string("/") + page_action_id;
   DispatchEvent(profile, event_name.c_str(), json_args);
 }