Revert 37914 - Move ChromeBrowserView* > BrowserView* and ChromeosBrowserView* > chromeos::BrowserView*

BUG=none
TEST=none

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

TBR=ben@chromium.org
Review URL: http://codereview.chromium.org/562030

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

1 files changed, 0 insertions, 447 deletions

diff --git a/chrome/browser/views/frame/browser_view_layout.cc b/chrome/browser/views/frame/browser_view_layout.cc
deleted file mode 100644
index e2c5ae1..0000000
--- a/chrome/browser/views/frame/browser_view_layout.cc
+++ /dev/null
@@ -1,447 +0,0 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "chrome/browser/views/frame/browser_view_layout.h"
-
-#include "app/gfx/scrollbar_size.h"
-#include "chrome/browser/find_bar.h"
-#include "chrome/browser/find_bar_controller.h"
-#include "chrome/browser/view_ids.h"
-#include "chrome/browser/views/bookmark_bar_view.h"
-#include "chrome/browser/views/download_shelf_view.h"
-#include "chrome/browser/views/extensions/extension_shelf.h"
-#include "chrome/browser/views/frame/browser_extender.h"
-#include "chrome/browser/views/frame/browser_frame.h"
-#include "chrome/browser/views/frame/browser_view.h"
-#include "chrome/browser/views/tabs/tab_strip.h"
-#include "chrome/browser/views/toolbar_view.h"
-#include "views/window/window.h"
-
-#if defined(OS_LINUX)
-#include "views/window/hit_test.h"
-#endif
-
-namespace {
-
-// The visible height of the shadow above the tabs. Clicks in this area are
-// treated as clicks to the frame, rather than clicks to the tab.
-const int kTabShadowSize = 2;
-// The vertical overlap between the TabStrip and the Toolbar.
-const int kToolbarTabStripVerticalOverlap = 3;
-// An offset distance between certain toolbars and the toolbar that preceded
-// them in layout.
-const int kSeparationLineHeight = 1;
-
-}  // namespace
-
-////////////////////////////////////////////////////////////////////////////////
-// BrowserViewLayout, public:
-
-BrowserViewLayout::BrowserViewLayout()
-    : tabstrip_(NULL),
-      toolbar_(NULL),
-      contents_split_(NULL),
-      contents_container_(NULL),
-      infobar_container_(NULL),
-      download_shelf_(NULL),
-      extension_shelf_(NULL),
-      active_bookmark_bar_(NULL),
-      browser_view_(NULL),
-      find_bar_y_(0) {
-}
-
-gfx::Size BrowserViewLayout::GetMinimumSize() {
-  // TODO(noname): In theory the tabstrip width should probably be
-  // (OTR + tabstrip + caption buttons) width.
-  gfx::Size tabstrip_size(
-      browser()->SupportsWindowFeature(Browser::FEATURE_TABSTRIP) ?
-      tabstrip_->GetMinimumSize() : gfx::Size());
-  gfx::Size toolbar_size(
-      (browser()->SupportsWindowFeature(Browser::FEATURE_TOOLBAR) ||
-       browser()->SupportsWindowFeature(Browser::FEATURE_LOCATIONBAR)) ?
-      toolbar_->GetMinimumSize() : gfx::Size());
-  if (tabstrip_size.height() && toolbar_size.height())
-    toolbar_size.Enlarge(0, -kToolbarTabStripVerticalOverlap);
-  gfx::Size bookmark_bar_size;
-  if (active_bookmark_bar_ &&
-      browser()->SupportsWindowFeature(Browser::FEATURE_BOOKMARKBAR)) {
-    bookmark_bar_size = active_bookmark_bar_->GetMinimumSize();
-    bookmark_bar_size.Enlarge(
-        0,
-        -kSeparationLineHeight -
-        active_bookmark_bar_->GetToolbarOverlap(true));
-  }
-  gfx::Size contents_size(contents_split_->GetMinimumSize());
-
-  int min_height = tabstrip_size.height() + toolbar_size.height() +
-      bookmark_bar_size.height() + contents_size.height();
-  int widths[] = { tabstrip_size.width(), toolbar_size.width(),
-                   bookmark_bar_size.width(), contents_size.width() };
-  int min_width = *std::max_element(&widths[0], &widths[arraysize(widths)]);
-  return gfx::Size(min_width, min_height);
-}
-
-gfx::Rect BrowserViewLayout::GetFindBarBoundingBox() const {
-  // This function returns the area the Find Bar can be laid out
-  // within. This basically implies the "user-perceived content
-  // area" of the browser window excluding the vertical
-  // scrollbar. This is not quite so straightforward as positioning
-  // based on the TabContentsContainer since the BookmarkBarView may
-  // be visible but not persistent (in the New Tab case) and we
-  // position the Find Bar over the top of it in that case since the
-  // BookmarkBarView is not _visually_ connected to the Toolbar.
-
-  // First determine the bounding box of the content area in Widget
-  // coordinates.
-  gfx::Rect bounding_box(contents_container_->bounds());
-
-  gfx::Point topleft;
-  views::View::ConvertPointToWidget(contents_container_, &topleft);
-  bounding_box.set_origin(topleft);
-
-  // Adjust the position and size of the bounding box by the find bar offset
-  // calculated during the last Layout.
-  int height_delta = find_bar_y_ - bounding_box.y();
-  bounding_box.set_y(find_bar_y_);
-  bounding_box.set_height(std::max(0, bounding_box.height() + height_delta));
-
-  // Finally decrease the width of the bounding box by the width of
-  // the vertical scroll bar.
-  int scrollbar_width = gfx::scrollbar_size();
-  bounding_box.set_width(std::max(0, bounding_box.width() - scrollbar_width));
-  if (browser_view_->UILayoutIsRightToLeft())
-    bounding_box.set_x(bounding_box.x() + scrollbar_width);
-
-  return bounding_box;
-}
-
-bool BrowserViewLayout::IsPositionInWindowCaption(
-    const gfx::Point& point) {
-  gfx::Point tabstrip_point(point);
-  views::View::ConvertPointToView(browser_view_, tabstrip_, &tabstrip_point);
-  return tabstrip_->IsPositionInWindowCaption(tabstrip_point);
-}
-
-int BrowserViewLayout::NonClientHitTest(
-    const gfx::Point& point) {
-  // Since the TabStrip only renders in some parts of the top of the window,
-  // the un-obscured area is considered to be part of the non-client caption
-  // area of the window. So we need to treat hit-tests in these regions as
-  // hit-tests of the titlebar.
-
-  views::View* parent = browser_view_->GetParent();
-
-  gfx::Point point_in_browser_view_coords(point);
-  views::View::ConvertPointToView(
-      parent, browser_view_, &point_in_browser_view_coords);
-
-  // Determine if the TabStrip exists and is capable of being clicked on. We
-  // might be a popup window without a TabStrip.
-  if (browser_view_->IsTabStripVisible()) {
-
-    // See if the mouse pointer is within the bounds of the TabStrip.
-    gfx::Point point_in_tabstrip_coords(point);
-    views::View::ConvertPointToView(parent, tabstrip_,
-                                    &point_in_tabstrip_coords);
-    if (tabstrip_->HitTest(point_in_tabstrip_coords)) {
-      if (tabstrip_->IsPositionInWindowCaption(point_in_tabstrip_coords))
-        return HTCAPTION;
-      return HTCLIENT;
-    }
-
-    // The top few pixels of the TabStrip are a drop-shadow - as we're pretty
-    // starved of dragable area, let's give it to window dragging (this also
-    // makes sense visually).
-    if (!browser_view_->IsMaximized() &&
-        (point_in_browser_view_coords.y() <
-         (tabstrip_->y() + kTabShadowSize))) {
-      // We return HTNOWHERE as this is a signal to our containing
-      // NonClientView that it should figure out what the correct hit-test
-      // code is given the mouse position...
-      return HTNOWHERE;
-    }
-  }
-
-  // If the point's y coordinate is below the top of the toolbar and otherwise
-  // within the bounds of this view, the point is considered to be within the
-  // client area.
-  gfx::Rect bv_bounds = browser_view_->bounds();
-  bv_bounds.Offset(0, toolbar_->y());
-  bv_bounds.set_height(bv_bounds.height() - toolbar_->y());
-  if (bv_bounds.Contains(point))
-    return HTCLIENT;
-
-  // If the point's y coordinate is above the top of the toolbar, but not in
-  // the tabstrip (per previous checking in this function), then we consider it
-  // in the window caption (e.g. the area to the right of the tabstrip
-  // underneath the window controls). However, note that we DO NOT return
-  // HTCAPTION here, because when the window is maximized the window controls
-  // will fall into this space (since the BrowserView is sized to entire size
-  // of the window at that point), and the HTCAPTION value will cause the
-  // window controls not to work. So we return HTNOWHERE so that the caller
-  // will hit-test the window controls before finally falling back to
-  // HTCAPTION.
-  bv_bounds = browser_view_->bounds();
-  bv_bounds.set_height(toolbar_->y());
-  if (bv_bounds.Contains(point))
-    return HTNOWHERE;
-
-  // If the point is somewhere else, delegate to the default implementation.
-  return browser_view_->views::ClientView::NonClientHitTest(point);
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// BrowserViewLayout, views::LayoutManager implementation:
-
-void BrowserViewLayout::Installed(views::View* host) {
-  toolbar_ = NULL;
-  contents_split_ = NULL;
-  contents_container_ = NULL;
-  infobar_container_ = NULL;
-  download_shelf_ = NULL;
-  extension_shelf_ = NULL;
-  active_bookmark_bar_ = NULL;
-  tabstrip_ = NULL;
-  browser_view_ = static_cast<BrowserView*>(host);
-}
-
-void BrowserViewLayout::Uninstalled(views::View* host) {}
-
-void BrowserViewLayout::ViewAdded(views::View* host, views::View* view) {
-  switch (view->GetID()) {
-    case VIEW_ID_CONTENTS_SPLIT:
-      contents_split_ = view;
-      contents_container_ = contents_split_->GetChildViewAt(0);
-      break;
-    case VIEW_ID_INFO_BAR_CONTAINER:
-      infobar_container_ = view;
-      break;
-    case VIEW_ID_DOWNLOAD_SHELF:
-      download_shelf_ = static_cast<DownloadShelfView*>(view);
-      break;
-    case VIEW_ID_DEV_EXTENSION_SHELF:
-      extension_shelf_ = static_cast<ExtensionShelf*>(view);
-      break;
-    case VIEW_ID_BOOKMARK_BAR:
-      active_bookmark_bar_ = static_cast<BookmarkBarView*>(view);
-      break;
-    case VIEW_ID_TOOLBAR:
-      toolbar_ = static_cast<ToolbarView*>(view);
-      break;
-    case VIEW_ID_TAB_STRIP:
-      tabstrip_ = static_cast<TabStrip*>(view);
-      break;
-  }
-}
-
-void BrowserViewLayout::ViewRemoved(views::View* host, views::View* view) {
-  switch (view->GetID()) {
-    case VIEW_ID_BOOKMARK_BAR:
-      active_bookmark_bar_ = NULL;
-      break;
-  }
-}
-
-void BrowserViewLayout::Layout(views::View* host) {
-  int top = LayoutTabStrip();
-  top = LayoutToolbar(top);
-  top = LayoutBookmarkAndInfoBars(top);
-  int bottom = LayoutExtensionAndDownloadShelves();
-  LayoutTabContents(top, bottom);
-  // This must be done _after_ we lay out the TabContents since this
-  // code calls back into us to find the bounding box the find bar
-  // must be laid out within, and that code depends on the
-  // TabContentsContainer's bounds being up to date.
-  if (browser()->HasFindBarController()) {
-    browser()->GetFindBarController()->find_bar()->MoveWindowIfNecessary(
-        gfx::Rect(), true);
-  }
-  // Align status bubble with the bottom of the contents_container.
-  browser_view_->LayoutStatusBubble(
-      top + contents_container_->bounds().height());
-  browser_view_->SchedulePaint();
-}
-
-// Return the preferred size which is the size required to give each
-// children their respective preferred size.
-gfx::Size BrowserViewLayout::GetPreferredSize(views::View* host) {
-  return gfx::Size();
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// BrowserViewLayout, private:
-
-int BrowserViewLayout::LayoutTabStrip() {
-  if (!browser_view_->IsTabStripVisible()) {
-    tabstrip_->SetVisible(false);
-    tabstrip_->SetBounds(0, 0, 0, 0);
-    return 0;
-  } else {
-    gfx::Rect layout_bounds =
-        browser_view_->frame()->GetBoundsForTabStrip(tabstrip_);
-    gfx::Rect toolbar_bounds = browser_view_->GetToolbarBounds();
-    tabstrip_->SetBackgroundOffset(
-        gfx::Point(layout_bounds.x() - toolbar_bounds.x(), layout_bounds.y()));
-
-    gfx::Point tabstrip_origin = layout_bounds.origin();
-    views::View::ConvertPointToView(browser_view_->GetParent(), browser_view_,
-                                  &tabstrip_origin);
-    layout_bounds.set_origin(tabstrip_origin);
-    tabstrip_->SetVisible(true);
-    tabstrip_->SetBounds(layout_bounds);
-    return layout_bounds.bottom();
-  }
-}
-
-int BrowserViewLayout::LayoutToolbar(int top) {
-  int browser_view_width = browser_view_->width();
-  bool visible = browser_view_->IsToolbarVisible();
-  toolbar_->location_bar()->SetFocusable(visible);
-  int y = top -
-      ((visible && browser_view_->IsTabStripVisible())
-       ? kToolbarTabStripVerticalOverlap : 0);
-  int height = visible ? toolbar_->GetPreferredSize().height() : 0;
-  toolbar_->SetVisible(visible);
-  toolbar_->SetBounds(0, y, browser_view_width, height);
-  return y + height;
-}
-
-int BrowserViewLayout::LayoutBookmarkAndInfoBars(int top) {
-  find_bar_y_ = top + browser_view_->y() - 1;
-  if (active_bookmark_bar_) {
-    // If we're showing the Bookmark bar in detached style, then we
-    // need to show any Info bar _above_ the Bookmark bar, since the
-    // Bookmark bar is styled to look like it's part of the page.
-    if (active_bookmark_bar_->IsDetached())
-      return LayoutTopBar(LayoutInfoBar(top));
-    // Otherwise, Bookmark bar first, Info bar second.
-    top = LayoutTopBar(top);
-  }
-  find_bar_y_ = top + browser_view_->y() - 1;
-  return LayoutInfoBar(top);
-}
-
-int BrowserViewLayout::LayoutTopBar(int top) {
-  // This method lays out the the bookmark bar, and, if required,
-  // the extension shelf by its side. The bookmark bar appears on
-  // the right of the extension shelf. If there are too many
-  // bookmark items and extension toolstrips to fit in the single
-  // bar, some compromises are made as follows: 1. The bookmark bar
-  // is shrunk till it reaches the minimum width.  2. After reaching
-  // the minimum width, the bookmark bar width is kept fixed - the
-  // extension shelf bar width is reduced.
-  DCHECK(active_bookmark_bar_);
-  int y = top, x = 0;
-  if (!browser_view_->IsBookmarkBarVisible()) {
-    active_bookmark_bar_->SetVisible(false);
-    active_bookmark_bar_->SetBounds(0, y, browser_view_->width(), 0);
-    if (extension_shelf_->IsOnTop())
-      extension_shelf_->SetVisible(false);
-    return y;
-  }
-
-  int bookmark_bar_height = active_bookmark_bar_->GetPreferredSize().height();
-  y -= kSeparationLineHeight + (
-      active_bookmark_bar_->IsDetached() ?
-      0 : active_bookmark_bar_->GetToolbarOverlap(false));
-
-  if (extension_shelf_->IsOnTop()) {
-    if (!active_bookmark_bar_->IsDetached()) {
-      int extension_shelf_width =
-          extension_shelf_->GetPreferredSize().width();
-      int bookmark_bar_given_width =
-          browser_view_->width() - extension_shelf_width;
-      int minimum_allowed_bookmark_bar_width =
-          active_bookmark_bar_->GetMinimumSize().width();
-      if (bookmark_bar_given_width < minimum_allowed_bookmark_bar_width) {
-        // The bookmark bar cannot compromise on its width any more. The
-        // extension shelf needs to shrink now.
-        extension_shelf_width =
-            browser_view_->width() - minimum_allowed_bookmark_bar_width;
-      }
-      extension_shelf_->SetVisible(true);
-      extension_shelf_->SetBounds(x, y, extension_shelf_width,
-                                  bookmark_bar_height);
-      x += extension_shelf_width;
-    } else {
-      // TODO(sidchat): For detached style bookmark bar, set the extensions
-      // shelf in a better position. Issue = 20741.
-      extension_shelf_->SetVisible(false);
-    }
-  }
-
-  active_bookmark_bar_->SetVisible(true);
-  active_bookmark_bar_->SetBounds(x, y,
-                                  browser_view_->width() - x,
-                                  bookmark_bar_height);
-  return y + bookmark_bar_height;
-}
-
-int BrowserViewLayout::LayoutInfoBar(int top) {
-  bool visible = browser()->SupportsWindowFeature(Browser::FEATURE_INFOBAR);
-  int height = visible ? infobar_container_->GetPreferredSize().height() : 0;
-  infobar_container_->SetVisible(visible);
-  infobar_container_->SetBounds(0, top, browser_view_->width(), height);
-  return top + height;
-}
-
-// Layout the TabContents container, between the coordinates |top| and
-// |bottom|.
-void BrowserViewLayout::LayoutTabContents(int top, int bottom) {
-  contents_split_->SetBounds(0, top, browser_view_->width(), bottom - top);
-}
-
-int BrowserViewLayout::LayoutExtensionAndDownloadShelves() {
-  // If we're showing the Extension bar in detached style, then we
-  // need to show Download shelf _above_ the Extension bar, since
-  // the Extension bar is styled to look like it's part of the page.
-  //
-  // TODO(Oshima): confirm this comment.
-  int bottom = browser_view_->height();
-  if (extension_shelf_) {
-    if (extension_shelf_->IsDetached()) {
-      bottom = LayoutDownloadShelf(bottom);
-      return LayoutExtensionShelf(bottom);
-    }
-    // Otherwise, Extension shelf first, Download shelf second.
-    bottom = LayoutExtensionShelf(bottom);
-  }
-  return LayoutDownloadShelf(bottom);
-}
-
-int BrowserViewLayout::LayoutDownloadShelf(int bottom) {
-  // Re-layout the shelf either if it is visible or if it's close animation
-  // is currently running.
-  if (browser_view_->IsDownloadShelfVisible() ||
-      (download_shelf_ && download_shelf_->IsClosing())) {
-    bool visible = browser()->SupportsWindowFeature(
-        Browser::FEATURE_DOWNLOADSHELF);
-    DCHECK(download_shelf_);
-    int height = visible ? download_shelf_->GetPreferredSize().height() : 0;
-    download_shelf_->SetVisible(visible);
-    download_shelf_->SetBounds(0, bottom - height,
-                               browser_view_->width(), height);
-    download_shelf_->Layout();
-    bottom -= height;
-  }
-  return bottom;
-}
-
-int BrowserViewLayout::LayoutExtensionShelf(int bottom) {
-  if (!extension_shelf_ || extension_shelf_->IsOnTop())
-    return bottom;
-
-  if (extension_shelf_) {
-    bool visible = browser()->SupportsWindowFeature(
-        Browser::FEATURE_EXTENSIONSHELF);
-    int height =
-        visible ? extension_shelf_->GetPreferredSize().height() : 0;
-    extension_shelf_->SetVisible(visible);
-    extension_shelf_->SetBounds(0, bottom - height,
-                                browser_view_->width(), height);
-    extension_shelf_->Layout();
-    bottom -= height;
-  }
-  return bottom;
-}