Adds the BrowserView to the XPFrame/VistaFrame, and moves the BrowserToolbarView and StatusBubble into it.

Also restructures the creation of the Frame. This is significant! The Browser now constructs a frame via a new static BrowserWindow::CreateBrowserWindow method (see browser_window_factory.cc). Recall the diagram in the architectural overview doc - the BrowserView object is the one that implements the interface that the Browser object uses to communicate with the UI. The Browser object communicates to the BrowserView directly through this interface, but not directly to the frame.

What actually happens right now in CreateBrowserWindow is that an XP/VistaFrame is constructed, but this is _not_ the object returned to the Browser, rather when the XP/VistaFrame is init'ed, it constructs a BrowserView that also implements BrowserWindow. This is the object that's returned to the Browser.

Since both BrowserView and XP/VistaFrame implement BrowserWindow, I am now able to gradually migrate functionality from the frames to BrowserView. During this process BrowserWindow functions not handled yet by BrowserView will be forwarded to the appropriate frame.

Modifies the Accessibility UI tests to account for this extra level of indirection (should only be temporary while I'm moving things around).

This does actually pass the UI tests.

See the whiteboard in my office for a diagram. This is a bit confusing right now since there's so much going on. Sadly the only way to get where we need to go incrementally is to make a mess on the way.

B=1031854

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

1 files changed, 81 insertions, 39 deletions

diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc
index cdbd9c9..c6d73f2 100644
--- a/chrome/browser/views/frame/browser_view.cc
+++ b/chrome/browser/views/frame/browser_view.cc
@@ -29,171 +29,203 @@
 
 #include "chrome/browser/views/frame/browser_view.h"
 
+#include "chrome/browser/browser.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents.h"
 #include "chrome/browser/tabs/tab_strip.h"
+#include "chrome/browser/view_ids.h"
 #include "chrome/browser/views/bookmark_bar_view.h"
 #include "chrome/browser/views/go_button.h"
 #include "chrome/browser/views/location_bar_view.h"
 #include "chrome/browser/views/status_bubble.h"
 #include "chrome/browser/views/toolbar_star_toggle.h"
+#include "chrome/browser/views/toolbar_view.h"
+#include "chrome/common/l10n_util.h"
+#include "generated_resources.h"
+
+// Status Bubble metrics.
+static const int kStatusBubbleHeight = 20;
+static const int kStatusBubbleOffset = 2;
 
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserView, public:
 
-BrowserView::BrowserView(ChromeViews::Window* window,
+BrowserView::BrowserView(BrowserWindow* frame,
+                         Browser* browser,
+                         ChromeViews::Window* window,
                          ChromeViews::View* contents_view)
-    : ClientView(window, contents_view) {
+    : frame_(frame),
+      browser_(browser),
+      initialized_(false)
+/*                     ,
+      ClientView(window, contents_view) */ {
 }
 
 BrowserView::~BrowserView() {
 }
 
+void BrowserView::LayoutStatusBubble(int status_bubble_y) {
+  status_bubble_->SetBounds(kStatusBubbleOffset,
+                            status_bubble_y - kStatusBubbleHeight +
+                            kStatusBubbleOffset,
+                            GetWidth() / 3,
+                            kStatusBubbleHeight);
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserView, BrowserWindow implementation:
 
 void BrowserView::Init() {
+  SetAccessibleName(l10n_util::GetString(IDS_PRODUCT_NAME));
 
+  toolbar_ = new BrowserToolbarView(browser_->controller(), browser_);
+  AddChildView(toolbar_);
+  toolbar_->SetID(VIEW_ID_TOOLBAR);
+  toolbar_->Init(browser_->profile());
+  toolbar_->SetAccessibleName(l10n_util::GetString(IDS_ACCNAME_TOOLBAR));
+
+  status_bubble_.reset(new StatusBubble(GetViewContainer()));
 }
 
 void BrowserView::Show(int command, bool adjust_to_fit) {
-
+  frame_->Show(command, adjust_to_fit);
 }
 
 void BrowserView::BrowserDidPaint(HRGN region) {
-
+  frame_->BrowserDidPaint(region);
 }
 
 void BrowserView::Close() {
-
+  frame_->Close();
 }
 
 void* BrowserView::GetPlatformID() {
-  return NULL;
+  return frame_->GetPlatformID();
 }
 
 TabStrip* BrowserView::GetTabStrip() const {
-  return NULL;
+  return frame_->GetTabStrip();
 }
 
 StatusBubble* BrowserView::GetStatusBubble() {
-  return NULL;
+  return status_bubble_.get();
 }
 
 ChromeViews::RootView* BrowserView::GetRootView() {
-  return NULL;
+  return frame_->GetRootView();
 }
 
 void BrowserView::ShelfVisibilityChanged() {
-
+  frame_->ShelfVisibilityChanged();
 }
 
 void BrowserView::SelectedTabToolbarSizeChanged(bool is_animating) {
-
+  frame_->SelectedTabToolbarSizeChanged(is_animating);
 }
 
 void BrowserView::UpdateTitleBar() {
-
+  frame_->UpdateTitleBar();
 }
 
 void BrowserView::SetWindowTitle(const std::wstring& title) {
-
+  frame_->SetWindowTitle(title);
 }
 
 void BrowserView::Activate() {
-
+  frame_->Activate();
 }
 
 void BrowserView::FlashFrame() {
-
+  frame_->FlashFrame();
 }
 
 void BrowserView::ShowTabContents(TabContents* contents) {
-
+  frame_->ShowTabContents(contents);
 }
 
 void BrowserView::ContinueDetachConstrainedWindowDrag(
     const gfx::Point& mouse_pt,
     int frame_component) {
-
+  frame_->ContinueDetachConstrainedWindowDrag(mouse_pt, frame_component);
 }
 
 void BrowserView::SizeToContents(const gfx::Rect& contents_bounds) {
-
+  frame_->SizeToContents(contents_bounds);
 }
 
 void BrowserView::SetAcceleratorTable(
     std::map<ChromeViews::Accelerator, int>* accelerator_table) {
-
+  frame_->SetAcceleratorTable(accelerator_table);
 }
 
 void BrowserView::ValidateThrobber() {
-
+  frame_->ValidateThrobber();
 }
 
 gfx::Rect BrowserView::GetNormalBounds() {
-  return gfx::Rect();
+  return frame_->GetNormalBounds();
 }
 
 bool BrowserView::IsMaximized() {
-  return false;
+  return frame_->IsMaximized();
 }
 
 gfx::Rect BrowserView::GetBoundsForContentBounds(const gfx::Rect content_rect) {
-  return gfx::Rect();
-}
-
-void BrowserView::SetBounds(const gfx::Rect& bounds) {
-
+  return frame_->GetBoundsForContentBounds(content_rect);
 }
 
 void BrowserView::DetachFromBrowser() {
-
+  frame_->DetachFromBrowser();
 }
 
 void BrowserView::InfoBubbleShowing() {
-
+  frame_->InfoBubbleShowing();
 }
 
 void BrowserView::InfoBubbleClosing() {
-
+  frame_->InfoBubbleClosing();
 }
 
 ToolbarStarToggle* BrowserView::GetStarButton() const {
-  return NULL;
+  return toolbar_->star_button();
 }
 
 LocationBarView* BrowserView::GetLocationBarView() const {
-  return NULL;
+  return toolbar_->GetLocationBarView();
 }
 
 GoButton* BrowserView::GetGoButton() const {
-  return NULL;
+  return toolbar_->GetGoButton();
 }
 
 BookmarkBarView* BrowserView::GetBookmarkBarView() {
+  return frame_->GetBookmarkBarView();
+}
+
+BrowserView* BrowserView::GetBrowserView() const {
   return NULL;
 }
 
 void BrowserView::Update(TabContents* contents, bool should_restore_state) {
-
+  toolbar_->Update(contents, should_restore_state);
 }
 
 void BrowserView::ProfileChanged(Profile* profile) {
-
+  toolbar_->SetProfile(profile);
 }
 
 void BrowserView::FocusToolbar() {
-
+  toolbar_->RequestFocus();
 }
 
 void BrowserView::DestroyBrowser() {
-
+  frame_->DestroyBrowser();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserView, ChromeViews::ClientView overrides:
 
+/*
 bool BrowserView::CanClose() const {
   return true;
 }
@@ -201,17 +233,27 @@ bool BrowserView::CanClose() const {
 int BrowserView::NonClientHitTest(const gfx::Point& point) {
   return HTCLIENT;
 }
+*/
 
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserView, ChromeViews::View overrides:
 
 void BrowserView::Layout() {
+  toolbar_->SetBounds(0, 0, GetWidth(), GetHeight());
+}
 
+void BrowserView::DidChangeBounds(const CRect& previous,
+                                  const CRect& current) {
+  Layout();
 }
 
 void BrowserView::ViewHierarchyChanged(bool is_add,
                                        ChromeViews::View* parent,
                                        ChromeViews::View* child) {
-
-
+  if (is_add && child == this && GetViewContainer() && !initialized_) {
+    Init();
+    // Make sure not to call Init() twice if we get inserted into a different
+    // ViewContainer.
+    initialized_ = true;
+  }
 }