Adds link to bookmark bar that when clicked imports bookmarks. I also

added support for baselines to GridLayout.

BUG=4374
TEST=On a new profile make sure the bookmark bar has a link to import
bookmarks, click the link and make sure you can import your bookmarks.

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

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

1 files changed, 9 insertions, 5 deletions

diff --git a/chrome/browser/views/bookmark_bar_view.h b/chrome/browser/views/bookmark_bar_view.h
index 49ac37f..92efeb8 100644
--- a/chrome/browser/views/bookmark_bar_view.h
+++ b/chrome/browser/views/bookmark_bar_view.h
@@ -8,8 +8,8 @@
 #include "app/slide_animation.h"
 #include "chrome/browser/bookmarks/bookmark_drag_data.h"
 #include "chrome/browser/bookmarks/bookmark_model_observer.h"
-#include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/sync/profile_sync_service.h"
+#include "chrome/browser/views/bookmark_bar_instructions_view.h"
 #include "chrome/browser/views/bookmark_menu_controller_views.h"
 #include "chrome/browser/views/detachable_toolbar_view.h"
 #include "chrome/common/notification_registrar.h"
@@ -22,7 +22,6 @@ class PrefService;
 
 namespace views {
 class CustomButton;
-class Label;
 class MenuButton;
 class MenuItemView;
 class TextButton;
@@ -44,7 +43,8 @@ class BookmarkBarView : public DetachableToolbarView,
                         public views::ContextMenuController,
                         public views::DragController,
                         public AnimationDelegate,
-                        public BookmarkMenuController::Observer {
+                        public BookmarkMenuController::Observer,
+                        public BookmarkBarInstructionsView::Delegate {
   friend class ShowFolderMenuTask;
 
  public:
@@ -204,6 +204,9 @@ class BookmarkBarView : public DetachableToolbarView,
       views::MenuItemView::AnchorPosition* anchor,
       int* start_index);
 
+  // BookmarkBarInstructionsView::Delegate.
+  virtual void ShowImportDialog();
+
   // Maximum size of buttons on the bookmark bar.
   static const int kMaxButtonWidth;
 
@@ -463,8 +466,9 @@ class BookmarkBarView : public DetachableToolbarView,
   // Visible if not all the bookmark buttons fit.
   views::MenuButton* overflow_button_;
 
-  // If no bookmarks are visible, we show some text explaining the bar.
-  views::Label* instructions_;
+  // BookmarkBarInstructionsView that is visible if there are no bookmarks on
+  // the bookmark bar.
+  views::View* instructions_;
 
   ButtonSeparatorView* bookmarks_separator_view_;