Merge r11285....

chrome/browser/views/frame/browser_view.cc

 // Copyright (c) 2006-2008 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.h"
 
 #include "base/command_line.h"
 #include "base/file_version_info.h"
 #include "base/time.h"
 #include "chrome/app/chrome_dll_resource.h"
@@ skipping 75 matching lines @@
 // How long do we wait before we consider a window hung (in ms).
 static const int kDefaultPluginMessageResponseTimeout = 30000;
 // The number of milliseconds between loading animation frames.
 static const int kLoadingAnimationFrameTimeMs = 30;
 // The amount of space we expect the window border to take up.
 static const int kWindowBorderWidth = 5;
 
 // If not -1, windows are shown with this state.
 static int explicit_show_state = -1;
 
+// Returned from BrowserView::GetClassName.
+static const char kBrowserViewClassName[] = "browser/views/BrowserView";
+
 static const struct {
   bool separator;
   int command;
   int label;
 } kMenuLayout[] = {
   { true, 0, 0 },
   { false, IDC_TASK_MANAGER, IDS_TASK_MANAGER },
   { true, 0, 0 },
   { false, IDC_ENCODING_MENU, IDS_ENCODING_MENU },
   { false, IDC_ZOOM_MENU, IDS_ZOOM_MENU },
@@ skipping 13 matching lines @@
   { false, IDC_RELOAD, IDS_APP_MENU_RELOAD },
   { false, IDC_FORWARD, IDS_CONTENT_CONTEXT_FORWARD },
   { false, IDC_BACK, IDS_CONTENT_CONTEXT_BACK }
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 // ResizeCorner, private:
 
 class ResizeCorner : public views::View {
  public:
-  explicit ResizeCorner(const BrowserView* parent)
-      : parent_(parent) {
-  }
+  ResizeCorner() { }
 
   virtual void Paint(ChromeCanvas* canvas) {
-    if (parent_ && !parent_->CanCurrentlyResize())
+    BrowserView* browser = GetBrowserView();
+    if (browser && !browser->CanCurrentlyResize())
       return;
 
     SkBitmap* bitmap = ResourceBundle::GetSharedInstance().GetBitmapNamed(
         IDR_TEXTAREA_RESIZER);
     bitmap->buildMipMap(false);
     bool rtl_dir = (l10n_util::GetTextDirection() == l10n_util::RIGHT_TO_LEFT);
     if (rtl_dir) {
       canvas->TranslateInt(width(), 0);
       canvas->ScaleInt(-1, 1);
       canvas->save();
     }
     canvas->DrawBitmapInt(*bitmap, width() - bitmap->width(),
                           height() - bitmap->height());
     if (rtl_dir)
       canvas->restore();
   }
 
   static gfx::Size GetSize() {
     // This is disabled until we find what makes us slower when we let
     // WebKit know that we have a resizer rect...
     // return gfx::Size(views::NativeScrollBar::GetVerticalScrollBarWidth(),
     //     views::NativeScrollBar::GetHorizontalScrollBarHeight());
     return gfx::Size();
   }
 
   virtual gfx::Size GetPreferredSize() {
-    return (parent_ && !parent_->CanCurrentlyResize()) ?
+    BrowserView* browser = GetBrowserView();
+    return (browser && !browser->CanCurrentlyResize()) ?
         gfx::Size() : GetSize();
   }
 
   virtual void Layout() {
     views::View* parent_view = GetParent();
     if (parent_view) {
       gfx::Size ps = GetPreferredSize();
       // No need to handle Right to left text direction here,
       // our parent must take care of it for us...
       SetBounds(parent_view->width() - ps.width(),
                 parent_view->height() - ps.height(), ps.width(), ps.height());
     }
   }
 
  private:
-  const BrowserView* parent_;
+  // Returns the BrowserView we're displayed in. Returns NULL if we're not
+  // currently in a browser view.
+  BrowserView* GetBrowserView() {
+    View* browser = GetAncestorWithClassName(kBrowserViewClassName);
+    return browser ? static_cast<BrowserView*>(browser) : NULL;
+  }
+
   DISALLOW_COPY_AND_ASSIGN(ResizeCorner);
 };
 
 
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserView, public:
 
 // static
 void BrowserView::SetShowState(int state) {
   explicit_show_state = state;
@@ skipping 990 matching lines @@
   if (bv_bounds.Contains(point))
     return HTNOWHERE;
 
   // If the point is somewhere else, delegate to the default implementation.
   return views::ClientView::NonClientHitTest(point);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserView, views::View overrides:
 
+std::string BrowserView::GetClassName() const {
+  return kBrowserViewClassName;
+}
+
 void BrowserView::Layout() {
   int top = LayoutTabStrip();
   top = LayoutToolbar(top);
   top = LayoutBookmarkAndInfoBars(top);
   int bottom = LayoutDownloadShelf();
   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.
@@ skipping 240 matching lines @@
   //             InfoBarContainer, DownloadShelfView and TabContents and this
   //             view is sorted out.
   return true;
 }
 
 bool BrowserView::MaybeShowDownloadShelf(TabContents* contents) {
   views::View* new_shelf = NULL;
   if (contents && contents->IsDownloadShelfVisible()) {
     new_shelf = static_cast<DownloadShelfView*>(contents->GetDownloadShelf());
     if (new_shelf != active_download_shelf_)
-      new_shelf->AddChildView(new ResizeCorner(this));
+      new_shelf->AddChildView(new ResizeCorner());
   }
   return UpdateChildViewAndLayout(new_shelf, &active_download_shelf_);
 }
 
 void BrowserView::UpdateUIForContents(TabContents* contents) {
   bool needs_layout = MaybeShowBookmarkBar(contents);
   needs_layout |= MaybeShowInfoBar(contents);
   needs_layout |= MaybeShowDownloadShelf(contents);
   if (needs_layout)
     Layout();
@@ skipping 197 matching lines @@
   }
 }
 
 // static
 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) {
   BrowserView* browser_view = new BrowserView(browser);
   (new BrowserFrame(browser_view))->Init();
   return browser_view;
 }