Create a bookmark editor dialog interface and implement a GTK version.

chrome/browser/bookmarks/bookmark_context_menu.cc

 // Copyright (c) 2006-2008 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/bookmarks/bookmark_context_menu.h"
 
 #include "base/compiler_specific.h"
+#include "chrome/browser/bookmarks/bookmark_editor.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/input_window_dialog.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/page_navigator.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "grit/generated_resources.h"
 
 // TODO(port): Port these files.
 #if defined(OS_WIN)
 #include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/browser/views/bookmark_editor_view.h"
 #include "chrome/browser/views/bookmark_manager_view.h"
 #include "chrome/views/window/window.h"
 #endif
 
 namespace {
 
 // Returns true if the specified node is of type URL, or has a descendant
 // of type URL.
 bool NodeHasURLs(BookmarkNode* node) {
   if (node->is_url())
@@ skipping 147 matching lines @@
   InputWindowDialog* dialog_;
 
   DISALLOW_COPY_AND_ASSIGN(EditFolderController);
 };
 
 #if defined(OS_WIN)
 // SelectOnCreationHandler ----------------------------------------------------
 
 // Used when adding a new bookmark. If a new bookmark is created it is selected
 // in the bookmark manager.
-class SelectOnCreationHandler : public BookmarkEditorView::Handler {
+class SelectOnCreationHandler : public BookmarkEditor::Handler {
  public:
   explicit SelectOnCreationHandler(Profile* profile) : profile_(profile) {
   }
 
   virtual void NodeCreated(BookmarkNode* new_node) {
     BookmarkManagerView* manager = BookmarkManagerView::current();
     if (!manager || manager->profile() != profile_)
       return;  // Manager no longer showing, or showing a different profile.
 
     manager->SelectInTree(new_node);
@@ skipping 126 matching lines @@
     case IDS_BOOKMARK_BAR_RENAME_FOLDER:
     case IDS_BOOKMARK_BAR_EDIT:
       UserMetrics::RecordAction(L"BookmarkBar_ContextMenu_Edit", profile_);
 
       if (selection_.size() != 1) {
         NOTREACHED();
         return;
       }
 
       if (selection_[0]->is_url()) {
-#if defined(OS_WIN)
-        BookmarkEditorView::Configuration editor_config;
+        BookmarkEditor::Configuration editor_config;
         if (configuration_ == BOOKMARK_BAR)
-          editor_config = BookmarkEditorView::SHOW_TREE;
+          editor_config = BookmarkEditor::SHOW_TREE;
         else
-          editor_config = BookmarkEditorView::NO_TREE;
-        BookmarkEditorView::Show(wnd_, profile_, NULL, selection_[0],
-                                 editor_config, NULL);
-#else
-      NOTIMPLEMENTED() << "BookmarkEditorView unimplemented";
-#endif
+          editor_config = BookmarkEditor::NO_TREE;
+        BookmarkEditor::Show(wnd_, profile_, NULL, selection_[0],
+                             editor_config, NULL);
       } else {
         EditFolderController::Show(profile_, wnd_, selection_[0], false,
                                    false);
       }
       break;
 
     case IDS_BOOKMARK_BAR_REMOVE: {
       UserMetrics::RecordAction(L"BookmarkBar_ContextMenu_Remove", profile_);
       BookmarkModel* model = RemoveModelObserver();
 
       for (size_t i = 0; i < selection_.size(); ++i) {
         model->Remove(selection_[i]->GetParent(),
                       selection_[i]->GetParent()->IndexOfChild(selection_[i]));
       }
       selection_.clear();
       break;
     }
 
     case IDS_BOOMARK_BAR_ADD_NEW_BOOKMARK: {
       UserMetrics::RecordAction(L"BookmarkBar_ContextMenu_Add", profile_);
 
+      BookmarkEditor::Configuration editor_config;
+      BookmarkEditor::Handler* handler = NULL;
+      if (configuration_ == BOOKMARK_BAR) {
+        editor_config = BookmarkEditor::SHOW_TREE;
+      } else {
+        editor_config = BookmarkEditor::NO_TREE;
 #if defined(OS_WIN)
-      BookmarkEditorView::Configuration editor_config;
-      BookmarkEditorView::Handler* handler = NULL;
-      if (configuration_ == BOOKMARK_BAR) {
-        editor_config = BookmarkEditorView::SHOW_TREE;
-      } else {
-        editor_config = BookmarkEditorView::NO_TREE;
         // This is owned by the BookmarkEditorView.
         handler = new SelectOnCreationHandler(profile_);
+#else
+        NOTIMPLEMENTED() << "Custom SelectOnCreationHandler not implemented";
+#endif
       }
-      BookmarkEditorView::Show(wnd_, profile_, GetParentForNewNodes(), NULL,
-                               editor_config, handler);
-#else
-      NOTIMPLEMENTED() << "Adding new bookmark not implemented";
-#endif
+      BookmarkEditor::Show(wnd_, profile_, GetParentForNewNodes(), NULL,
+                           editor_config, handler);
       break;
     }
 
     case IDS_BOOMARK_BAR_NEW_FOLDER: {
       UserMetrics::RecordAction(L"BookmarkBar_ContextMenu_NewFolder",
                                 profile_);
       EditFolderController::Show(profile_, wnd_, GetParentForNewNodes(),
                                  true, (configuration_ != BOOKMARK_BAR));
       break;
     }
@@ skipping 159 matching lines @@
     if (NodeHasURLs(selection_[i]))
       return true;
   }
   return false;
 }
 
 BookmarkNode* BookmarkContextMenu::GetParentForNewNodes() const {
   return (selection_.size() == 1 && selection_[0]->is_folder()) ?
       selection_[0] : parent_;
 }