Linux bookmark manager first cut.

chrome/browser/bookmarks/bookmark_context_menu.cc

-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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 "app/l10n_util.h"
 #include "base/compiler_specific.h"
 #include "chrome/browser/bookmarks/bookmark_editor.h"
+#include "chrome/browser/bookmarks/bookmark_manager.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/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_manager_view.h"
 #include "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())
     return true;
@@ skipping 63 matching lines @@
   // InputWindowDialog::Delegate methods.
   virtual bool IsValid(const std::wstring& text) {
     return !text.empty();
   }
 
   virtual void InputAccepted(const std::wstring& text) {
     if (is_new_) {
       ALLOW_UNUSED BookmarkNode* node =
           model_->AddGroup(node_, node_->GetChildCount(), text);
       if (show_in_manager_) {
-#if defined(OS_WIN)
-        BookmarkManagerView* manager = BookmarkManagerView::current();
-        if (manager && manager->profile() == profile_)
-          manager->SelectInTree(node);
+#if defined(OS_WIN) || defined(OS_LINUX)
+        BookmarkManager::SelectInTree(profile_, node);
 #else
-        NOTIMPLEMENTED() << "BookmarkManagerView not yet implemented";
+        NOTIMPLEMENTED() << "BookmarkManager not yet implemented";
 #endif
       }
     } else {
       model_->SetTitle(node_, text);
     }
   }
 
   virtual void InputCanceled() {
   }
 
@@ skipping 63 matching lines @@
 // SelectOnCreationHandler ----------------------------------------------------
 
 // Used when adding a new bookmark. If a new bookmark is created it is selected
 // in the bookmark manager.
 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);
+    BookmarkManager::SelectInTree(profile_, new_node);
   }
 
  private:
   Profile* profile_;
 
   DISALLOW_COPY_AND_ASSIGN(SelectOnCreationHandler);
 };
 #endif  // #if defined(OS_WIN)
 
 }  // namespace
@@ skipping 116 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)
+#if defined(OS_WIN) || defined(OS_LINUX)
         BookmarkEditor::Configuration editor_config;
         if (configuration_ == BOOKMARK_BAR)
           editor_config = BookmarkEditor::SHOW_TREE;
         else
           editor_config = BookmarkEditor::NO_TREE;
         BookmarkEditor::Show(wnd_, profile_, NULL, selection_[0],
                              editor_config, NULL);
 #else
         NOTIMPLEMENTED();
 #endif
@@ skipping 50 matching lines @@
 
     case IDS_BOOKMARK_MANAGER_SHOW_IN_FOLDER:
       UserMetrics::RecordAction(L"BookmarkBar_ContextMenu_ShowInFolder",
                                 profile_);
 
       if (selection_.size() != 1) {
         NOTREACHED();
         return;
       }
 
-#if defined(OS_WIN)
-      if (BookmarkManagerView::current())
-        BookmarkManagerView::current()->SelectInTree(selection_[0]);
+#if defined(OS_WIN) || defined(OS_LINUX)
+      BookmarkManager::SelectInTree(profile_, selection_[0]);
 #else
       NOTIMPLEMENTED() << "Bookmark Manager not implemented";
 #endif
       break;
 
     case IDS_BOOKMARK_MANAGER:
       UserMetrics::RecordAction(L"ShowBookmarkManager", profile_);
-#if defined(OS_WIN)
-      BookmarkManagerView::Show(profile_);
+#if defined(OS_WIN) || defined(OS_LINUX)
+      BookmarkManager::Show(profile_);
 #else
       NOTIMPLEMENTED() << "Bookmark Manager not implemented";
 #endif
       break;
 
     case IDS_BOOKMARK_MANAGER_SORT:
       UserMetrics::RecordAction(L"BookmarkManager_Sort", profile_);
       model_->SortChildren(parent_);
       break;
 
@@ skipping 123 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_;
 }