summaryrefslogtreecommitdiffstats
path: root/chrome/browser/xp_frame.h
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/xp_frame.h')
-rw-r--r--chrome/browser/xp_frame.h12
1 files changed, 8 insertions, 4 deletions
diff --git a/chrome/browser/xp_frame.h b/chrome/browser/xp_frame.h
index f500fad..b5f96ff 100644
--- a/chrome/browser/xp_frame.h
+++ b/chrome/browser/xp_frame.h
@@ -49,7 +49,7 @@
#define XP_FRAME_CLASSNAME L"Chrome_XPFrame"
-class ChromeViews::RootView;
+class BookmarkBarView;
class Browser;
class BrowserToolbarView;
class TabContentsContainerView;
@@ -113,6 +113,7 @@ class XPFrame : public BrowserWindow,
virtual ToolbarStarToggle* GetStarButton() const;
virtual LocationBarView* GetLocationBarView() const;
virtual GoButton* GetGoButton() const;
+ virtual BookmarkBarView* GetBookmarkBarView();
virtual void Update(TabContents* contents, bool should_restore_state);
virtual void ProfileChanged(Profile* profile);
virtual void FocusToolbar();
@@ -485,9 +486,6 @@ class XPFrame : public BrowserWindow,
// A view positioned at the bottom of the frame.
ChromeViews::View* shelf_view_;
- // View positioned beneath the tab strip.
- ChromeViews::View* bookmark_bar_view_;
-
// A view positioned beneath the bookmark bar.
// Implementation mirrors shelf_view_
ChromeViews::View* info_bar_view_;
@@ -498,6 +496,12 @@ class XPFrame : public BrowserWindow,
// The Toolbar containing the navigation buttons, menus and the address bar.
BrowserToolbarView* toolbar_;
+ // The bookmark bar. This is lazily created.
+ scoped_ptr<BookmarkBarView> bookmark_bar_view_;
+
+ // The visible bookmark bar. NULL if none is visible.
+ ChromeViews::View* active_bookmark_bar_;
+
// The optional container for the off the record icon.
ChromeViews::ImageView* off_the_record_image_;