Move BrowserToolbarView to the frames (XPFrame/VistaFrame).

This causes some temporary duplication of code in xp/vista frames but it will be temporary. My goal is to move all the top level browser level views into the frames. From there, I will move them from the frames into their new home - BrowserView (chrome/browser/views/frames/browser_view.cc), and each frame will host a BrowserView. This will reduce duplication of code.

To make this change I had to add a bunch of methods to the BrowserWindow (nee ChromeFrame) interface to provide access to some of the toolbar's contents. Excuse the ugly API, we will be improving this incrementally.

B=1031854

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

1 files changed, 10 insertions, 3 deletions

diff --git a/chrome/browser/xp_frame.h b/chrome/browser/xp_frame.h
index a3fa706..f500fad 100644
--- a/chrome/browser/xp_frame.h
+++ b/chrome/browser/xp_frame.h
@@ -51,6 +51,7 @@
 
 class ChromeViews::RootView;
 class Browser;
+class BrowserToolbarView;
 class TabContentsContainerView;
 class TabStrip;
 class TemporaryPlaceholder;
@@ -109,6 +110,12 @@ class XPFrame : public BrowserWindow,
   virtual void DetachFromBrowser();
   virtual void InfoBubbleShowing();
   virtual void InfoBubbleClosing();
+  virtual ToolbarStarToggle* GetStarButton() const;
+  virtual LocationBarView* GetLocationBarView() const;
+  virtual GoButton* GetGoButton() const;
+  virtual void Update(TabContents* contents, bool should_restore_state);
+  virtual void ProfileChanged(Profile* profile);
+  virtual void FocusToolbar();
 
   //
   // CWindowImpl event management magic. See atlcrack.h
@@ -423,9 +430,6 @@ class XPFrame : public BrowserWindow,
   // Top level view used to render the frame itself including the title bar
   XPFrameView* frame_view_;
 
-  // Toolbar provided by our browser
-  ChromeViews::View* toolbar_;
-
   // Browser contents
   TabContentsContainerView* tab_contents_container_;
 
@@ -491,6 +495,9 @@ class XPFrame : public BrowserWindow,
   // The view that contains the tabs and any associated controls.
   TabStrip* tabstrip_;
 
+  // The Toolbar containing the navigation buttons, menus and the address bar.
+  BrowserToolbarView* toolbar_;
+
   // The optional container for the off the record icon.
   ChromeViews::ImageView* off_the_record_image_;