New event style for pageAction API....

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/json_writer.h"
 #include "base/values.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/profile.h"
@@ skipping 75 matching lines @@
 
 static void DispatchEvent(Profile* profile,
                           const char* event_name,
                           const std::string json_args) {
   if (profile->GetExtensionMessageService()) {
     profile->GetExtensionMessageService()->
         DispatchEventToRenderers(event_name, json_args);
   }
 }
 
+static void DispatchEventWithTab(Profile* profile,
+                                 const char* event_name,
+                                 const TabContents* tab_contents) {
+  ListValue args;
+  args.Append(ExtensionTabUtil::CreateTabValue(tab_contents));
+  std::string json_args;
+  base::JSONWriter::Write(&args, false, &json_args);
+  DispatchEvent(profile, event_name, json_args);
+}
+
 static void DispatchSimpleBrowserEvent(Profile* profile,
                                        const int window_id,
                                        const char* event_name) {
   ListValue args;
   args.Append(Value::CreateIntegerValue(window_id));
 
   std::string json_args;
   base::JSONWriter::Write(&args, false, &json_args);
 
   DispatchEvent(profile, event_name, json_args);
@@ skipping 91 matching lines @@
 void ExtensionBrowserEventRouter::OnBrowserSetLastActive(
     const Browser* browser) {
   DispatchSimpleBrowserEvent(browser->profile(),
                              ExtensionTabUtil::GetWindowId(browser),
                              events::kOnWindowFocusedChanged);
 }
 
 void ExtensionBrowserEventRouter::TabCreatedAt(TabContents* contents,
                                                 int index,
                                                 bool foreground) {
-  ListValue args;
-  args.Append(ExtensionTabUtil::CreateTabValue(contents));
-  std::string json_args;
-  base::JSONWriter::Write(&args, false, &json_args);
-
-  DispatchEvent(contents->profile(), events::kOnTabCreated, json_args);
+  DispatchEventWithTab(contents->profile(), events::kOnTabCreated, contents);
 
   RegisterForTabNotifications(contents);
 }
 
 void ExtensionBrowserEventRouter::TabInsertedAt(TabContents* contents,
                                                 int index,
                                                 bool foreground) {
   // If tab is new, send created event.
   int tab_id = ExtensionTabUtil::GetTabId(contents);
   if (tab_entries_.find(tab_id) == tab_entries_.end()) {
@@ skipping 163 matching lines @@
 }
 
 void ExtensionBrowserEventRouter::TabChangedAt(TabContents* contents,
                                                int index,
                                                TabChangeType change_type) {
   TabUpdated(contents, false);
 }
 
 void ExtensionBrowserEventRouter::TabStripEmpty() { }
 
-void ExtensionBrowserEventRouter::PageActionExecuted(
+void ExtensionBrowserEventRouter::DispatchOldPageActionEvent(
     Profile* profile,
     const std::string& extension_id,
     const std::string& page_action_id,
     int tab_id,
     const std::string& url,
     int button) {
   ListValue args;
   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));
   data->Set(page_action_keys::kButtonKey, Value::CreateIntegerValue(button));
   args.Append(data);
 
   std::string json_args;
   base::JSONWriter::Write(&args, false, &json_args);
 
+  std::string event_name = std::string("pageActions/") + extension_id;
+  DispatchEvent(profile, event_name.c_str(), json_args);
+}
+
+void ExtensionBrowserEventRouter::PageActionExecuted(
+    Profile* profile,
+    const std::string& extension_id,
+    const std::string& page_action_id,
+    int tab_id,
+    const std::string& url,
+    int button) {
+  DispatchOldPageActionEvent(profile, extension_id, page_action_id, tab_id, url,
+                             button);
+  TabContents* tab_contents = NULL;
+  if (!ExtensionTabUtil::GetTabById(tab_id, profile, NULL, NULL, &tab_contents,
+                                    NULL)) {
+    return;
+  }
   std::string event_name = std::string("pageAction/") + extension_id;
-  DispatchEvent(profile, event_name.c_str(), json_args);
+  DispatchEventWithTab(profile, event_name.c_str(), tab_contents);
 }
 
 void ExtensionBrowserEventRouter::BrowserActionExecuted(
     Profile* profile, const std::string& extension_id, Browser* browser) {
   TabContents* tab_contents = NULL;
   int tab_id = 0;
   if (!ExtensionTabUtil::GetDefaultTab(browser, &tab_contents, &tab_id))
     return;
-
-  ListValue args;
-  args.Append(ExtensionTabUtil::CreateTabValue(tab_contents));
-  std::string json_args;
-  base::JSONWriter::Write(&args, false, &json_args);
-
   std::string event_name = std::string("browserAction/") + extension_id;
-  DispatchEvent(profile, event_name.c_str(), json_args);
+  DispatchEventWithTab(profile, event_name.c_str(), tab_contents);
 }