bookmarks: Rename ExtensionBookmarkManagerEventRouter.

Note: This was a TODO for aa@.

R=sky@chromium.org

Review URL: http://codereview.chromium.org/8416036

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107945 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/bookmarks/bookmark_manager_extension_api.cc

@@ -146,19 +146,19 @@ void BookmarkNodeDataToJSON(Profile* profile, const BookmarkNodeData& data,
 
 }  // namespace
 
-ExtensionBookmarkManagerEventRouter::ExtensionBookmarkManagerEventRouter(
+BookmarkManagerExtensionEventRouter::BookmarkManagerExtensionEventRouter(
     Profile* profile, TabContentsWrapper* tab)
     : profile_(profile),
     tab_(tab) {
   tab_->bookmark_tab_helper()->SetBookmarkDragDelegate(this);
 }
 
-ExtensionBookmarkManagerEventRouter::~ExtensionBookmarkManagerEventRouter() {
+BookmarkManagerExtensionEventRouter::~BookmarkManagerExtensionEventRouter() {
   if (tab_->bookmark_tab_helper()->GetBookmarkDragDelegate() == this)
     tab_->bookmark_tab_helper()->SetBookmarkDragDelegate(NULL);
 }
 
-void ExtensionBookmarkManagerEventRouter::DispatchEvent(const char* event_name,
+void BookmarkManagerExtensionEventRouter::DispatchEvent(const char* event_name,
                                                         const ListValue* args) {
   if (!profile_->GetExtensionEventRouter())
     return;
@@ -169,7 +169,7 @@ void ExtensionBookmarkManagerEventRouter::DispatchEvent(const char* event_name,
       event_name, json_args, NULL, GURL());
 }
 
-void ExtensionBookmarkManagerEventRouter::DispatchDragEvent(
+void BookmarkManagerExtensionEventRouter::DispatchDragEvent(
     const BookmarkNodeData& data, const char* event_name) {
   if (data.size() == 0)
     return;
@@ -179,23 +179,23 @@ void ExtensionBookmarkManagerEventRouter::DispatchDragEvent(
   DispatchEvent(event_name, &args);
 }
 
-void ExtensionBookmarkManagerEventRouter::OnDragEnter(
+void BookmarkManagerExtensionEventRouter::OnDragEnter(
     const BookmarkNodeData& data) {
   DispatchDragEvent(data, keys::kOnBookmarkDragEnter);
 }
 
-void ExtensionBookmarkManagerEventRouter::OnDragOver(
+void BookmarkManagerExtensionEventRouter::OnDragOver(
     const BookmarkNodeData& data) {
   // Intentionally empty since these events happens too often and floods the
   // message queue. We do not need this event for the bookmark manager anyway.
 }
 
-void ExtensionBookmarkManagerEventRouter::OnDragLeave(
+void BookmarkManagerExtensionEventRouter::OnDragLeave(
     const BookmarkNodeData& data) {
   DispatchDragEvent(data, keys::kOnBookmarkDragLeave);
 }
 
-void ExtensionBookmarkManagerEventRouter::OnDrop(
+void BookmarkManagerExtensionEventRouter::OnDrop(
     const BookmarkNodeData& data) {
   DispatchDragEvent(data, keys::kOnBookmarkDrop);
 
@@ -205,13 +205,13 @@ void ExtensionBookmarkManagerEventRouter::OnDrop(
 }
 
 const BookmarkNodeData*
-ExtensionBookmarkManagerEventRouter::GetBookmarkNodeData() {
+BookmarkManagerExtensionEventRouter::GetBookmarkNodeData() {
   if (bookmark_drag_data_.is_valid())
     return &bookmark_drag_data_;
   return NULL;
 }
 
-void ExtensionBookmarkManagerEventRouter::ClearBookmarkNodeData() {
+void BookmarkManagerExtensionEventRouter::ClearBookmarkNodeData() {
   bookmark_drag_data_.Clear();
 }
 
@@ -420,8 +420,8 @@ bool DropBookmarkManagerFunction::RunImpl() {
     ExtensionWebUI* web_ui =
         static_cast<ExtensionWebUI*>(tab_contents->web_ui());
     CHECK(web_ui);
-    ExtensionBookmarkManagerEventRouter* router =
-        web_ui->extension_bookmark_manager_event_router();
+    BookmarkManagerExtensionEventRouter* router =
+        web_ui->bookmark_manager_extension_event_router();
 
     DCHECK(router);
     const BookmarkNodeData* drag_data = router->GetBookmarkNodeData();

chrome/browser/bookmarks/bookmark_manager_extension_api.h

@@ -20,13 +20,12 @@ class ListValue;
 }
 
 // Class that handles the chrome.experimental.bookmarkManager events.
-// TODO(aa): Rename this
-class ExtensionBookmarkManagerEventRouter
+class BookmarkManagerExtensionEventRouter
     : public BookmarkTabHelper::BookmarkDrag {
  public:
-  ExtensionBookmarkManagerEventRouter(Profile* profile,
+  BookmarkManagerExtensionEventRouter(Profile* profile,
                                       TabContentsWrapper* tab);
-  virtual ~ExtensionBookmarkManagerEventRouter();
+  virtual ~BookmarkManagerExtensionEventRouter();
 
   // RenderViewHostDelegate::BookmarkDrag interface
   virtual void OnDragEnter(const BookmarkNodeData& data);
@@ -51,7 +50,7 @@ class ExtensionBookmarkManagerEventRouter
   TabContentsWrapper* tab_;
   BookmarkNodeData bookmark_drag_data_;
 
-  DISALLOW_COPY_AND_ASSIGN(ExtensionBookmarkManagerEventRouter);
+  DISALLOW_COPY_AND_ASSIGN(BookmarkManagerExtensionEventRouter);
 };
 
 class ClipboardBookmarkManagerFunction : public BookmarksFunction {

chrome/browser/extensions/extension_web_ui.cc

@@ -162,8 +162,8 @@ ExtensionWebUI::ExtensionWebUI(TabContents* tab_contents, const GURL& url)
     TabContentsWrapper* tab =
         TabContentsWrapper::GetCurrentWrapperForContents(tab_contents_);
     DCHECK(tab);
-    extension_bookmark_manager_event_router_.reset(
-        new ExtensionBookmarkManagerEventRouter(profile, tab));
+    bookmark_manager_extension_event_router_.reset(
+        new BookmarkManagerExtensionEventRouter(profile, tab));
 
     link_transition_type_ = content::PAGE_TRANSITION_AUTO_BOOKMARK;
   }
@@ -171,9 +171,9 @@ ExtensionWebUI::ExtensionWebUI(TabContents* tab_contents, const GURL& url)
 
 ExtensionWebUI::~ExtensionWebUI() {}
 
-ExtensionBookmarkManagerEventRouter*
-ExtensionWebUI::extension_bookmark_manager_event_router() {
-  return extension_bookmark_manager_event_router_.get();
+BookmarkManagerExtensionEventRouter*
+ExtensionWebUI::bookmark_manager_extension_event_router() {
+  return bookmark_manager_extension_event_router_.get();
 }
 
 ////////////////////////////////////////////////////////////////////////////////

chrome/browser/extensions/extension_web_ui.h

@@ -37,8 +37,8 @@ class ExtensionWebUI : public ChromeWebUI {
 
   virtual ~ExtensionWebUI();
 
-  virtual ExtensionBookmarkManagerEventRouter*
-      extension_bookmark_manager_event_router();
+  virtual BookmarkManagerExtensionEventRouter*
+      bookmark_manager_extension_event_router();
 
   // BrowserURLHandler
   static bool HandleChromeURLOverride(GURL* url,
@@ -75,8 +75,8 @@ class ExtensionWebUI : public ChromeWebUI {
 
   // TODO(aa): This seems out of place. Why is it not with the event routers for
   // the other extension APIs?
-  scoped_ptr<ExtensionBookmarkManagerEventRouter>
-      extension_bookmark_manager_event_router_;
+  scoped_ptr<BookmarkManagerExtensionEventRouter>
+      bookmark_manager_extension_event_router_;
 
   // The URL this WebUI was created for.
   GURL url_;