Compact Navigation prototype

chrome/browser/ui/views/frame/opaque_browser_frame_view.cc

 // Copyright (c) 2011 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/ui/views/frame/opaque_browser_frame_view.h"
 
 #include "base/compiler_specific.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/ui/views/frame/browser_frame.h"
@@ skipping 72 matching lines @@
 // In maximized mode, where the New Tab button and the caption buttons are at
 // similar vertical coordinates, we need to reserve a larger, 16 px gap to avoid
 // looking too cluttered.
 const int kNewTabCaptionMaximizedSpacing = 16;
 // How far to indent the tabstrip from the left side of the screen when there
 // is no OTR icon.
 const int kTabStripIndent = 1;
 // Inset from the top of the toolbar/tabstrip to the shadow. Used only for
 // vertical tabs.
 const int kVerticalTabBorderInset = 3;
+
+// Converts |bounds| from |src|'s coordinate system to |dst|, and checks if
+// |pt| is contained within.
+bool ConvertedContainsCheck(gfx::Rect bounds, const views::View* src,
+                            const views::View* dst, const gfx::Point& pt) {
+  DCHECK(src);
+  DCHECK(dst);
+  gfx::Point origin(bounds.origin());
+  views::View::ConvertPointToView(src, dst, &origin);
+  bounds.set_origin(origin);
+  return bounds.Contains(pt);
+}
+
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // OpaqueBrowserFrameView, public:
 
 OpaqueBrowserFrameView::OpaqueBrowserFrameView(BrowserFrame* frame,
                                                BrowserView* browser_view)
     : BrowserNonClientFrameView(),
       ALLOW_THIS_IN_INITIALIZER_LIST(
           minimize_button_(new views::ImageButton(this))),
@@ skipping 282 matching lines @@
 void OpaqueBrowserFrameView::OnPaint(gfx::Canvas* canvas) {
   views::Window* window = frame_->GetWindow();
   if (window->IsFullscreen())
     return;  // Nothing is visible, so don't bother to paint.
 
   if (window->IsMaximized())
     PaintMaximizedFrameBorder(canvas);
   else
     PaintRestoredFrameBorder(canvas);
   PaintTitleBar(canvas);
-  if (browser_view_->IsToolbarVisible())
+  if (browser_view_->IsToolbarVisible() ||
+      browser_view_->UseCompactNavigationBar())
     PaintToolbarBackground(canvas);
   if (browser_view_->ShouldShowOffTheRecordAvatar())
     PaintOTRAvatar(canvas);
   if (!window->IsMaximized())
     PaintRestoredClientEdge(canvas);
 }
 
 void OpaqueBrowserFrameView::Layout() {
   LayoutWindowControls();
   LayoutTitleBar();
@@ skipping 12 matching lines @@
   gfx::Rect tabstrip_bounds = GetBoundsForTabStrip(browser_view_->tabstrip());
   gfx::Point tabstrip_origin(tabstrip_bounds.origin());
   View::ConvertPointToView(frame_->GetWindow()->client_view(),
                            this, &tabstrip_origin);
   tabstrip_bounds.set_origin(tabstrip_origin);
   if ((!vertical_tabs && l.y() > tabstrip_bounds.bottom()) ||
       (vertical_tabs && l.x() > tabstrip_bounds.right())) {
     return false;
   }
 
+  // Claim it only if we're also not in the compact navigation buttons.
+  if (browser_view_->UseCompactNavigationBar()) {

[sky, 2011/05/03 18:38:32]

Did you need to do anything in glass_browser_frame_view?

[SteveT, 2011/05/06 18:48:43]

No - it turns out GlassBrowserFrameView's HitTest handles this tab region
differently and our clicks go through to the NavBar or OptBar without additional
hit tests.

+    if (ConvertedContainsCheck(browser_view_->GetCompactNavigationBarBounds(),
+                               frame_->GetWindow()->client_view(),
+                               static_cast<const View*>(this),
+                               l)) {
+      return false;
+    }
+    if (ConvertedContainsCheck(browser_view_->GetCompactOptionsBarBounds(),
+                               frame_->GetWindow()->client_view(),
+                               static_cast<const View*>(this),
+                               l)) {
+      return false;
+    }
+  }
+
   // We convert from our parent's coordinates since we assume we fill its bounds
   // completely. We need to do this since we're not a parent of the tabstrip,
   // meaning ConvertPointToView would otherwise return something bogus.
   gfx::Point browser_view_point(l);
   View::ConvertPointToView(parent(), browser_view_, &browser_view_point);
   return browser_view_->IsPositionInWindowCaption(browser_view_point);
 }
 
 void OpaqueBrowserFrameView::GetAccessibleState(
     ui::AccessibleViewState* state) {
@@ skipping 453 matching lines @@
 }
 
 void OpaqueBrowserFrameView::PaintRestoredClientEdge(gfx::Canvas* canvas) {
   ui::ThemeProvider* tp = GetThemeProvider();
   int client_area_top = frame_->GetWindow()->client_view()->y();
   int image_top = client_area_top;
 
   gfx::Rect client_area_bounds = CalculateClientAreaBounds(width(), height());
   SkColor toolbar_color = tp->GetColor(ThemeService::COLOR_TOOLBAR);
 
-  if (browser_view_->IsToolbarVisible()) {
+  if (browser_view_->IsToolbarVisible() ||
+      browser_view_->UseCompactNavigationBar()) {
     // The client edge images always start below the toolbar corner images.  The
-    // client edge filled rects start there or at the bottom of the tooolbar,
+    // client edge filled rects start there or at the bottom of the toolbar,
     // whichever is shorter.
     gfx::Rect toolbar_bounds(browser_view_->GetToolbarBounds());
     image_top += toolbar_bounds.y() +
         tp->GetBitmapNamed(IDR_CONTENT_TOP_LEFT_CORNER)->height();
     client_area_top = std::min(image_top,
         client_area_top + toolbar_bounds.bottom() - kClientEdgeThickness);
     if (browser_view_->UseVerticalTabs()) {
       client_area_top -= kVerticalTabBorderInset;
       image_top -= kVerticalTabBorderInset;
     }
@@ skipping 183 matching lines @@
 
 gfx::Rect OpaqueBrowserFrameView::CalculateClientAreaBounds(int width,
                                                             int height) const {
   int top_height = NonClientTopBorderHeight(false, false);
   int border_thickness = NonClientBorderThickness();
   return gfx::Rect(border_thickness, top_height,
                    std::max(0, width - (2 * border_thickness)),
                    std::max(0, height - GetReservedHeight() -
                        top_height - border_thickness));
 }