Consolidate [BrowserAction,PageAction,ScriptBadge]API into ExtensionActionAPI

chrome/browser/extensions/browser_event_router.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/browser_event_router.h"
 
 #include "base/json/json_writer.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/api/extension_action/extension_page_actions_api_constants.h"
 #include "chrome/browser/extensions/api/tabs/tabs_constants.h"
@@ skipping 12 matching lines @@
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/extensions/api/extension_action/action_info.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/web_contents.h"
 
 namespace events = extensions::event_names;
 namespace tab_keys = extensions::tabs_constants;
-namespace page_action_keys = extension_page_actions_api_constants;
+namespace extension_action_keys = extension_page_actions_api_constants;

[Yoyo Zhou, 2013/01/02 21:56:05]

I think this should also go back to being page_action_keys, or rather
page_actions_keys.

[Devlin, 2013/01/16 21:07:31]

Done.

 
 using content::NavigationController;
 using content::WebContents;
 
 namespace extensions {
 
 BrowserEventRouter::TabEntry::TabEntry()
     : complete_waiting_on_load_(false),
       url_() {
 }
@@ skipping 452 matching lines @@
     const std::string& page_action_id,
     int tab_id,
     const std::string& url,
     int button) {
   scoped_ptr<ListValue> args(new ListValue());
   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));
+  data->Set(extension_action_keys::kButtonKey,
+            Value::CreateIntegerValue(button));
   args->Append(data);
 
   DispatchEventToExtension(profile, extension_id, "pageActions", args.Pass(),
                            EventRouter::USER_GESTURE_ENABLED);
 }
 
 void BrowserEventRouter::BrowserActionExecuted(
     const ExtensionAction& browser_action,
     Browser* browser) {
   Profile* profile = browser->profile();
@@ skipping 60 matching lines @@
 
     DispatchEventToExtension(profile,
                              extension_action.extension_id(),
                              event_name,
                              args.Pass(),
                              EventRouter::USER_GESTURE_ENABLED);
   }
 }
 
 }  // namespace extensions