Linux bookmark manager first cut.

Also add icons to bookmark tree model.

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

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

2 files changed, 14 insertions, 9 deletions

diff --git a/chrome/browser/views/bookmark_manager_view.cc b/chrome/browser/views/bookmark_manager_view.cc
index a6f0819..4673c71 100644
--- a/chrome/browser/views/bookmark_manager_view.cc
+++ b/chrome/browser/views/bookmark_manager_view.cc
@@ -12,6 +12,7 @@
 #include "base/thread.h"
 #include "chrome/browser/bookmarks/bookmark_folder_tree_model.h"
 #include "chrome/browser/bookmarks/bookmark_html_writer.h"
+#include "chrome/browser/bookmarks/bookmark_manager.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_table_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
@@ -36,7 +37,6 @@
 #include "views/widget/widget.h"
 #include "views/window/window.h"
 
-
 // If non-null, there is an open editor and this is the window it is contained
 // in it.
 static views::Window* open_window = NULL;
@@ -143,6 +143,19 @@ void ShowBookmarkManagerView(Profile* profile) {
 
 }  // namespace browser
 
+// BookmarkManager -------------------------------------------------------------
+
+void BookmarkManager::SelectInTree(Profile* profile, BookmarkNode* node) {
+  if (manager && manager->profile() == profile)
+    manager->SelectInTree(node);
+}
+
+void BookmarkManager::Show(Profile* profile) {
+  BookmarkManagerView::Show(profile);
+}
+
+// -----------------------------------------------------------------------------
+
 BookmarkManagerView::BookmarkManagerView(Profile* profile)
     : profile_(profile->GetOriginalProfile()),
       table_view_(NULL),
@@ -232,11 +245,6 @@ BookmarkManagerView::~BookmarkManagerView() {
   open_window = NULL;
 }
 
-// static
-void BookmarkManagerView::RegisterPrefs(PrefService* prefs) {
-  prefs->RegisterDictionaryPref(prefs::kBookmarkManagerPlacement);
-  prefs->RegisterIntegerPref(prefs::kBookmarkManagerSplitLocation, -1);
-}
 
 // static
 void BookmarkManagerView::Show(Profile* profile) {
diff --git a/chrome/browser/views/bookmark_manager_view.h b/chrome/browser/views/bookmark_manager_view.h
index 12706fd..8419a0d 100644
--- a/chrome/browser/views/bookmark_manager_view.h
+++ b/chrome/browser/views/bookmark_manager_view.h
@@ -22,7 +22,6 @@ class BookmarkFolderTreeModel;
 class BookmarkFolderTreeView;
 class BookmarkTableModel;
 class BookmarkTableView;
-class PrefService;
 class Profile;
 
 namespace views {
@@ -55,8 +54,6 @@ class BookmarkManagerView : public views::View,
   explicit BookmarkManagerView(Profile* profile);
   virtual ~BookmarkManagerView();
 
-  static void RegisterPrefs(PrefService* prefs);
-
   // Shows the bookmark manager. Only one bookmark manager exists.
   static void Show(Profile* profile);