diff options
20 files changed, 30 insertions, 92 deletions
diff --git a/chrome/browser/chromeos/extensions/file_manager/event_router.cc b/chrome/browser/chromeos/extensions/file_manager/event_router.cc index 214d6d2..7ea4d09 100644 --- a/chrome/browser/chromeos/extensions/file_manager/event_router.cc +++ b/chrome/browser/chromeos/extensions/file_manager/event_router.cc @@ -25,7 +25,6 @@ #include "chrome/browser/chromeos/login/login_display_host_impl.h" #include "chrome/browser/chromeos/login/screen_locker.h" #include "chrome/browser/drive/drive_service_interface.h" -#include "chrome/browser/extensions/event_names.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" diff --git a/chrome/browser/chromeos/extensions/input_method_api.cc b/chrome/browser/chromeos/extensions/input_method_api.cc index dbe2834..bb46b31 100644 --- a/chrome/browser/chromeos/extensions/input_method_api.cc +++ b/chrome/browser/chromeos/extensions/input_method_api.cc @@ -8,7 +8,6 @@ #include "base/values.h" #include "chrome/browser/chromeos/extensions/input_method_event_router.h" #include "chrome/browser/extensions/api/input_ime/input_ime_api.h" -#include "chrome/browser/extensions/event_names.h" #include "chromeos/ime/extension_ime_util.h" #include "chromeos/ime/input_method_manager.h" #include "extensions/browser/extension_function_registry.h" @@ -62,10 +61,14 @@ bool StartImeFunction::RunImpl() { #endif } +// static +const char InputMethodAPI::kOnInputMethodChanged[] = + "inputMethodPrivate.onChanged"; + InputMethodAPI::InputMethodAPI(content::BrowserContext* context) : context_(context) { - ExtensionSystem::Get(context_)->event_router()-> - RegisterObserver(this, event_names::kOnInputMethodChanged); + ExtensionSystem::Get(context_)->event_router()->RegisterObserver( + this, kOnInputMethodChanged); ExtensionFunctionRegistry* registry = ExtensionFunctionRegistry::GetInstance(); registry->RegisterFunction<GetInputMethodFunction>(); diff --git a/chrome/browser/chromeos/extensions/input_method_api.h b/chrome/browser/chromeos/extensions/input_method_api.h index 0245664..c940ebb 100644 --- a/chrome/browser/chromeos/extensions/input_method_api.h +++ b/chrome/browser/chromeos/extensions/input_method_api.h @@ -50,6 +50,8 @@ class StartImeFunction : public SyncExtensionFunction { class InputMethodAPI : public BrowserContextKeyedAPI, public extensions::EventRouter::Observer { public: + static const char kOnInputMethodChanged[]; + explicit InputMethodAPI(content::BrowserContext* context); virtual ~InputMethodAPI(); diff --git a/chrome/browser/chromeos/extensions/input_method_event_router.cc b/chrome/browser/chromeos/extensions/input_method_event_router.cc index 069d3ff5..39ca79a 100644 --- a/chrome/browser/chromeos/extensions/input_method_event_router.cc +++ b/chrome/browser/chromeos/extensions/input_method_event_router.cc @@ -9,7 +9,6 @@ #include "base/json/json_writer.h" #include "base/values.h" #include "chrome/browser/chromeos/extensions/input_method_api.h" -#include "chrome/browser/extensions/event_names.h" #include "content/public/browser/browser_context.h" #include "extensions/browser/event_router.h" #include "extensions/browser/extension_system.h" @@ -32,8 +31,10 @@ void ExtensionInputMethodEventRouter::InputMethodChanged( extensions::EventRouter *router = extensions::ExtensionSystem::Get(context_)->event_router(); - if (!router->HasEventListener(extensions::event_names::kOnInputMethodChanged)) + if (!router->HasEventListener( + extensions::InputMethodAPI::kOnInputMethodChanged)) { return; + } scoped_ptr<base::ListValue> args(new base::ListValue()); base::StringValue *input_method_name = new base::StringValue( @@ -43,7 +44,7 @@ void ExtensionInputMethodEventRouter::InputMethodChanged( // The router will only send the event to extensions that are listening. scoped_ptr<extensions::Event> event(new extensions::Event( - extensions::event_names::kOnInputMethodChanged, args.Pass())); + extensions::InputMethodAPI::kOnInputMethodChanged, args.Pass())); event->restrict_to_browser_context = context_; router->BroadcastEvent(event.Pass()); } diff --git a/chrome/browser/extensions/api/bluetooth/bluetooth_api.cc b/chrome/browser/extensions/api/bluetooth/bluetooth_api.cc index d556a1b..6213313 100644 --- a/chrome/browser/extensions/api/bluetooth/bluetooth_api.cc +++ b/chrome/browser/extensions/api/bluetooth/bluetooth_api.cc @@ -10,7 +10,6 @@ #include "base/memory/ref_counted.h" #include "chrome/browser/extensions/api/bluetooth/bluetooth_api_utils.h" #include "chrome/browser/extensions/api/bluetooth/bluetooth_event_router.h" -#include "chrome/browser/extensions/event_names.h" #include "chrome/common/extensions/api/bluetooth.h" #include "chrome/common/extensions/api/bluetooth/bluetooth_manifest_data.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/extensions/api/bluetooth/bluetooth_event_router_unittest.cc b/chrome/browser/extensions/api/bluetooth/bluetooth_event_router_unittest.cc index a444d63..cf63775 100644 --- a/chrome/browser/extensions/api/bluetooth/bluetooth_event_router_unittest.cc +++ b/chrome/browser/extensions/api/bluetooth/bluetooth_event_router_unittest.cc @@ -10,7 +10,6 @@ #include "base/run_loop.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/api/bluetooth/bluetooth_event_router.h" -#include "chrome/browser/extensions/event_names.h" #include "chrome/browser/extensions/extension_system_factory.h" #include "chrome/browser/extensions/test_extension_system.h" #include "chrome/common/extensions/api/bluetooth.h" diff --git a/chrome/browser/extensions/api/dial/dial_registry.cc b/chrome/browser/extensions/api/dial/dial_registry.cc index eb80c39..66d88b4 100644 --- a/chrome/browser/extensions/api/dial/dial_registry.cc +++ b/chrome/browser/extensions/api/dial/dial_registry.cc @@ -13,7 +13,6 @@ #include "chrome/browser/extensions/api/dial/dial_api.h" #include "chrome/browser/extensions/api/dial/dial_device_data.h" #include "chrome/browser/extensions/api/dial/dial_service.h" -#include "chrome/browser/extensions/event_names.h" #include "chrome/browser/net/chrome_net_log.h" #include "chrome/common/extensions/api/dial.h" diff --git a/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.cc b/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.cc index e636a75..e0147dc 100644 --- a/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.cc +++ b/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.cc @@ -14,7 +14,6 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/api/media_galleries_private/gallery_watch_manager.h" #include "chrome/browser/extensions/api/media_galleries_private/media_galleries_private_event_router.h" -#include "chrome/browser/extensions/event_names.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/media_galleries/media_file_system_registry.h" diff --git a/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_event_router.cc b/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_event_router.cc index b07fbb8a..1f16b95 100644 --- a/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_event_router.cc +++ b/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_event_router.cc @@ -7,7 +7,6 @@ #include "chrome/browser/extensions/api/media_galleries_private/media_galleries_private_event_router.h" #include "base/values.h" -#include "chrome/browser/extensions/event_names.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/api/media_galleries_private.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/extensions/api/notifications/notifications_api.cc b/chrome/browser/extensions/api/notifications/notifications_api.cc index 362b63c..1ee1c10 100644 --- a/chrome/browser/extensions/api/notifications/notifications_api.cc +++ b/chrome/browser/extensions/api/notifications/notifications_api.cc @@ -11,7 +11,6 @@ #include "base/strings/utf_string_conversions.h" #include "base/time/time.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/extensions/event_names.h" #include "chrome/browser/notifications/desktop_notification_service.h" #include "chrome/browser/notifications/desktop_notification_service_factory.h" #include "chrome/browser/notifications/notification.h" @@ -144,10 +143,7 @@ class NotificationsApiDelegate : public NotificationDelegate { virtual void Display() OVERRIDE { } - virtual void Error() OVERRIDE { - scoped_ptr<base::ListValue> args(CreateBaseEventArgs()); - SendEvent(event_names::kOnNotificationError, args.Pass()); - } + virtual void Error() OVERRIDE {} virtual void Close(bool by_user) OVERRIDE { scoped_ptr<base::ListValue> args(CreateBaseEventArgs()); diff --git a/chrome/browser/extensions/api/sync_file_system/extension_sync_event_observer.cc b/chrome/browser/extensions/api/sync_file_system/extension_sync_event_observer.cc index b548029..5323dc6 100644 --- a/chrome/browser/extensions/api/sync_file_system/extension_sync_event_observer.cc +++ b/chrome/browser/extensions/api/sync_file_system/extension_sync_event_observer.cc @@ -6,7 +6,6 @@ #include "base/lazy_instance.h" #include "chrome/browser/extensions/api/sync_file_system/sync_file_system_api_helpers.h" -#include "chrome/browser/extensions/event_names.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/sync_file_system/sync_event_observer.h" #include "chrome/browser/sync_file_system/sync_file_system_service.h" diff --git a/chrome/browser/extensions/api/sync_file_system/sync_file_system_apitest.cc b/chrome/browser/extensions/api/sync_file_system/sync_file_system_apitest.cc index 89bc875..aeab4b6 100644 --- a/chrome/browser/extensions/api/sync_file_system/sync_file_system_apitest.cc +++ b/chrome/browser/extensions/api/sync_file_system/sync_file_system_apitest.cc @@ -6,7 +6,6 @@ #include "base/command_line.h" #include "base/path_service.h" #include "base/run_loop.h" -#include "chrome/browser/extensions/event_names.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service.h" #include "chrome/browser/sync_file_system/file_status_observer.h" diff --git a/chrome/browser/extensions/api/tab_capture/tab_capture_api.cc b/chrome/browser/extensions/api/tab_capture/tab_capture_api.cc index 8f9cd6e..54cd55b 100644 --- a/chrome/browser/extensions/api/tab_capture/tab_capture_api.cc +++ b/chrome/browser/extensions/api/tab_capture/tab_capture_api.cc @@ -14,7 +14,6 @@ #include "base/strings/stringprintf.h" #include "base/values.h" #include "chrome/browser/extensions/api/tab_capture/tab_capture_registry.h" -#include "chrome/browser/extensions/event_names.h" #include "chrome/browser/extensions/extension_renderer_state.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sessions/session_tab_helper.h" diff --git a/chrome/browser/extensions/event_names.cc b/chrome/browser/extensions/event_names.cc deleted file mode 100644 index a2833b9..0000000 --- a/chrome/browser/extensions/event_names.cc +++ /dev/null @@ -1,20 +0,0 @@ -// 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/event_names.h" - -namespace extensions { - -namespace event_names { - -const char kOnInputMethodChanged[] = "inputMethodPrivate.onChanged"; - -const char kOnContextMenus[] = "contextMenus"; -const char kOnWebviewContextMenus[] = "webview.contextMenus"; - -const char kOnNotificationError[] = "notifications.onError"; - -} // namespace event_names - -} // namespace extensions diff --git a/chrome/browser/extensions/event_names.h b/chrome/browser/extensions/event_names.h deleted file mode 100644 index 3ba5c0b..0000000 --- a/chrome/browser/extensions/event_names.h +++ /dev/null @@ -1,36 +0,0 @@ -// 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. - -// Constants for the event names sent to extensions. - -#ifndef CHROME_BROWSER_EXTENSIONS_EVENT_NAMES_H_ -#define CHROME_BROWSER_EXTENSIONS_EVENT_NAMES_H_ - -namespace extensions { - -namespace event_names { - -// FileBrowser. -extern const char kOnDirectoryChanged[]; -extern const char kOnFileBrowserMountCompleted[]; -extern const char kOnFileTransfersUpdated[]; -extern const char kOnFileBrowserPreferencesChanged[]; -extern const char kOnFileBrowserDriveConnectionStatusChanged[]; -extern const char kOnFileBrowserCopyProgress[]; - -// InputMethod. -extern const char kOnInputMethodChanged[]; - -// Context menus. -extern const char kOnContextMenus[]; -extern const char kOnWebviewContextMenus[]; - -// Notifications. -extern const char kOnNotificationError[]; - -} // namespace event_names - -} // namespace extensions - -#endif // CHROME_BROWSER_EXTENSIONS_EVENT_NAMES_H_ diff --git a/chrome/browser/extensions/menu_manager.cc b/chrome/browser/extensions/menu_manager.cc index e0bffce..27accff 100644 --- a/chrome/browser/extensions/menu_manager.cc +++ b/chrome/browser/extensions/menu_manager.cc @@ -13,7 +13,6 @@ #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/chrome_notification_types.h" -#include "chrome/browser/extensions/event_names.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_tab_util.h" #include "chrome/browser/extensions/menu_manager_factory.h" @@ -298,6 +297,10 @@ bool MenuItem::PopulateURLPatterns( return true; } +// static +const char MenuManager::kOnContextMenus[] = "contextMenus"; +const char MenuManager::kOnWebviewContextMenus[] = "webview.contextMenus"; + MenuManager::MenuManager(Profile* profile, StateStore* store) : profile_(profile), store_(store) { registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_LOADED, @@ -699,8 +702,8 @@ void MenuManager::ExecuteCommand(Profile* profile, { // Dispatch to menu item's .onclick handler. scoped_ptr<Event> event( - new Event(webview_guest ? event_names::kOnWebviewContextMenus - : event_names::kOnContextMenus, + new Event(webview_guest ? kOnWebviewContextMenus + : kOnContextMenus, scoped_ptr<base::ListValue>(args->DeepCopy()))); event->restrict_to_browser_context = profile; event->user_gesture = EventRouter::USER_GESTURE_ENABLED; diff --git a/chrome/browser/extensions/menu_manager.h b/chrome/browser/extensions/menu_manager.h index e25e58a..9fdf1168 100644 --- a/chrome/browser/extensions/menu_manager.h +++ b/chrome/browser/extensions/menu_manager.h @@ -269,6 +269,9 @@ class MenuManager : public content::NotificationObserver, public base::SupportsWeakPtr<MenuManager>, public KeyedService { public: + static const char kOnContextMenus[]; + static const char kOnWebviewContextMenus[]; + MenuManager(Profile* profile, StateStore* store_); virtual ~MenuManager(); diff --git a/chrome/browser/extensions/menu_manager_unittest.cc b/chrome/browser/extensions/menu_manager_unittest.cc index 3a9d37d..3b16b7f 100644 --- a/chrome/browser/extensions/menu_manager_unittest.cc +++ b/chrome/browser/extensions/menu_manager_unittest.cc @@ -13,7 +13,6 @@ #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/chrome_notification_types.h" -#include "chrome/browser/extensions/event_names.h" #include "chrome/browser/extensions/extension_system_factory.h" #include "chrome/browser/extensions/menu_manager.h" #include "chrome/browser/extensions/test_extension_prefs.h" @@ -586,15 +585,14 @@ TEST_F(MenuManagerTest, ExecuteCommand) { { InSequence s; EXPECT_CALL(*mock_event_router, - DispatchEventToExtensionMock( - item->extension_id(), - extensions::event_names::kOnContextMenus, - _, - &profile, - GURL(), - EventRouter::USER_GESTURE_ENABLED)) - .Times(1) - .WillOnce(SaveArg<2>(&list)); + DispatchEventToExtensionMock(item->extension_id(), + MenuManager::kOnContextMenus, + _, + &profile, + GURL(), + EventRouter::USER_GESTURE_ENABLED)) + .Times(1) + .WillOnce(SaveArg<2>(&list)); EXPECT_CALL(*mock_event_router, DispatchEventToExtensionMock( item->extension_id(), diff --git a/chrome/browser/ui/ash/ash_keyboard_controller_proxy.cc b/chrome/browser/ui/ash/ash_keyboard_controller_proxy.cc index 860ea48..4a71cd4 100644 --- a/chrome/browser/ui/ash/ash_keyboard_controller_proxy.cc +++ b/chrome/browser/ui/ash/ash_keyboard_controller_proxy.cc @@ -7,7 +7,6 @@ #include "ash/display/display_controller.h" #include "ash/shell.h" #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h" -#include "chrome/browser/extensions/event_names.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/media/media_capture_devices_dispatcher.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/chrome_browser_extensions.gypi b/chrome/chrome_browser_extensions.gypi index 588b9e0..9584f24 100644 --- a/chrome/chrome_browser_extensions.gypi +++ b/chrome/chrome_browser_extensions.gypi @@ -651,8 +651,6 @@ 'browser/extensions/devtools_util.cc', 'browser/extensions/error_console/error_console.cc', 'browser/extensions/error_console/error_console.h', - 'browser/extensions/event_names.cc', - 'browser/extensions/event_names.h', 'browser/extensions/event_router_forwarder.cc', 'browser/extensions/event_router_forwarder.h', 'browser/extensions/extension_action.cc', |