Move BookmarkManagerAPI to c/b/e/api

chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.h

Index: chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.h
diff --git a/chrome/browser/bookmarks/bookmark_manager_extension_api.h b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.h
similarity index 74%
rename from chrome/browser/bookmarks/bookmark_manager_extension_api.h
rename to chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.h
index dc24d13f4368f29697ea890196ebb766b47aa9b9..adae0f59787da4c29eace2a1f74ffb4902fb6279 100644
--- a/chrome/browser/bookmarks/bookmark_manager_extension_api.h
+++ b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.h
@@ -2,13 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_BOOKMARKS_BOOKMARK_MANAGER_EXTENSION_API_H_
-#define CHROME_BROWSER_BOOKMARKS_BOOKMARK_MANAGER_EXTENSION_API_H_
+#ifndef CHROME_BROWSER_EXTENSIONS_API_BOOKMARK_MANAGER_PRIVATE_BOOKMARK_MANAGER_PRIVATE_API_H_
+#define CHROME_BROWSER_EXTENSIONS_API_BOOKMARK_MANAGER_PRIVATE_BOOKMARK_MANAGER_PRIVATE_API_H_
 
 #include "base/values.h"
 #include "chrome/browser/bookmarks/bookmark_node_data.h"
-// TODO (rdevlin.cronin): Move BookmarkManagerAPI to
-// chrome/browser/extensions/api/bookmark so these two aren't interdependent.
 #include "chrome/browser/extensions/api/bookmarks/bookmark_api.h"
 #include "chrome/browser/extensions/extension_function.h"
 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h"
@@ -20,13 +18,14 @@ namespace content {
 class WebContents;
 }
 
+namespace extensions {
+
 // Class that handles the chrome.bookmarkManagerPrivate events.
-class BookmarkManagerExtensionEventRouter
-    : public BookmarkTabHelper::BookmarkDrag {
+class BookmarkManagerEventRouter : public BookmarkTabHelper::BookmarkDrag {

[Yoyo Zhou, 2012/12/10 22:35:10]

Should also be called BookmarkManagerPrivateEventRouter (sorry, it's a mouthful)

[Devlin, 2012/12/10 22:55:04]

Done.

  public:
-  BookmarkManagerExtensionEventRouter(Profile* profile,
-                                      content::WebContents* web_contents);
-  virtual ~BookmarkManagerExtensionEventRouter();
+  BookmarkManagerEventRouter(Profile* profile,
+                             content::WebContents* web_contents);
+  virtual ~BookmarkManagerEventRouter();
 
   // BookmarkTabHelper::BookmarkDrag interface
   virtual void OnDragEnter(const BookmarkNodeData& data) OVERRIDE;
@@ -52,10 +51,10 @@ class BookmarkManagerExtensionEventRouter
   content::WebContents* web_contents_;
   BookmarkNodeData bookmark_drag_data_;
 
-  DISALLOW_COPY_AND_ASSIGN(BookmarkManagerExtensionEventRouter);
+  DISALLOW_COPY_AND_ASSIGN(BookmarkManagerEventRouter);
 };
 
-class ClipboardBookmarkManagerFunction : public extensions::BookmarksFunction {
+class ClipboardBookmarkManagerFunction : public BookmarksFunction {
  protected:
   virtual ~ClipboardBookmarkManagerFunction() {}
 
@@ -84,7 +83,7 @@ class CutBookmarkManagerFunction : public ClipboardBookmarkManagerFunction {
   virtual bool RunImpl() OVERRIDE;
 };
 
-class PasteBookmarkManagerFunction : public extensions::BookmarksFunction {
+class PasteBookmarkManagerFunction : public BookmarksFunction {
  public:
   DECLARE_EXTENSION_FUNCTION_NAME("bookmarkManagerPrivate.paste");
 
@@ -95,7 +94,7 @@ class PasteBookmarkManagerFunction : public extensions::BookmarksFunction {
   virtual bool RunImpl() OVERRIDE;
 };
 
-class CanPasteBookmarkManagerFunction : public extensions::BookmarksFunction {
+class CanPasteBookmarkManagerFunction : public BookmarksFunction {
  public:
   DECLARE_EXTENSION_FUNCTION_NAME("bookmarkManagerPrivate.canPaste");
 
@@ -106,8 +105,7 @@ class CanPasteBookmarkManagerFunction : public extensions::BookmarksFunction {
   virtual bool RunImpl() OVERRIDE;
 };
 
-class SortChildrenBookmarkManagerFunction
-    : public extensions::BookmarksFunction {
+class SortChildrenBookmarkManagerFunction : public BookmarksFunction {
  public:
   DECLARE_EXTENSION_FUNCTION_NAME("bookmarkManagerPrivate.sortChildren");
 
@@ -129,7 +127,7 @@ class BookmarkManagerGetStringsFunction : public AsyncExtensionFunction {
   virtual bool RunImpl() OVERRIDE;
 };
 
-class StartDragBookmarkManagerFunction : public extensions::BookmarksFunction {
+class StartDragBookmarkManagerFunction : public BookmarksFunction {
  public:
   DECLARE_EXTENSION_FUNCTION_NAME("bookmarkManagerPrivate.startDrag");
 
@@ -140,7 +138,7 @@ class StartDragBookmarkManagerFunction : public extensions::BookmarksFunction {
   virtual bool RunImpl() OVERRIDE;
 };
 
-class DropBookmarkManagerFunction : public extensions::BookmarksFunction {
+class DropBookmarkManagerFunction : public BookmarksFunction {
  public:
   DECLARE_EXTENSION_FUNCTION_NAME("bookmarkManagerPrivate.drop");
 
@@ -151,7 +149,7 @@ class DropBookmarkManagerFunction : public extensions::BookmarksFunction {
   virtual bool RunImpl() OVERRIDE;
 };
 
-class GetSubtreeBookmarkManagerFunction : public extensions::BookmarksFunction {
+class GetSubtreeBookmarkManagerFunction : public BookmarksFunction {
  public:
   DECLARE_EXTENSION_FUNCTION_NAME("bookmarkManagerPrivate.getSubtree");
 
@@ -162,7 +160,7 @@ class GetSubtreeBookmarkManagerFunction : public extensions::BookmarksFunction {
   virtual bool RunImpl() OVERRIDE;
 };
 
-class CanEditBookmarkManagerFunction : public extensions::BookmarksFunction {
+class CanEditBookmarkManagerFunction : public BookmarksFunction {
  public:
   DECLARE_EXTENSION_FUNCTION_NAME("bookmarkManagerPrivate.canEdit");
 
@@ -173,7 +171,7 @@ class CanEditBookmarkManagerFunction : public extensions::BookmarksFunction {
   virtual bool RunImpl() OVERRIDE;
 };
 
-class RecordLaunchBookmarkFunction : public extensions::BookmarksFunction {
+class RecordLaunchBookmarkFunction : public BookmarksFunction {
  public:
   DECLARE_EXTENSION_FUNCTION_NAME("bookmarkManagerPrivate.recordLaunch")
 
@@ -184,7 +182,7 @@ class RecordLaunchBookmarkFunction : public extensions::BookmarksFunction {
   virtual bool RunImpl() OVERRIDE;
 };
 
-class CanOpenNewWindowsBookmarkFunction : public extensions::BookmarksFunction {
+class CanOpenNewWindowsBookmarkFunction : public BookmarksFunction {
  public:
   DECLARE_EXTENSION_FUNCTION_NAME("bookmarkManagerPrivate.canOpenNewWindows");
 
@@ -195,5 +193,6 @@ class CanOpenNewWindowsBookmarkFunction : public extensions::BookmarksFunction {
   virtual bool RunImpl() OVERRIDE;
 };
 
+}  // namespace extensions
 
-#endif  // CHROME_BROWSER_BOOKMARKS_BOOKMARK_MANAGER_EXTENSION_API_H_
+#endif  // CHROME_BROWSER_EXTENSIONS_API_BOOKMARK_MANAGER_PRIVATE_BOOKMARK_MANAGER_PRIVATE_API_H_