Adding the flip windows button to the browser window

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

 // Copyright (c) 2012 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/browser_view_layout.h"
 
 #include "chrome/browser/ui/find_bar/find_bar.h"
 #include "chrome/browser/ui/find_bar/find_bar_controller.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"
@@ skipping 14 matching lines @@
 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;
 // The number of pixels the bookmark bar should overlap the spacer by if the
 // spacer is visible.
 const int kSpacerBookmarkBarOverlap = 1;
+// The number of pixels the metro switcher is offset from the right edge.
+const int kWindowSwitcherOffsetX = 5;
 
 // Combines View::ConvertPointToView and View::HitTest for a given |point|.
 // Converts |point| from |src| to |dst| and hit tests it against |dst|. The
 // converted |point| can then be retrieved and used for additional tests.
 bool ConvertedHitTest(views::View* src, views::View* dst, gfx::Point* point) {
   DCHECK(src);
   DCHECK(dst);
   DCHECK(point);
   views::View::ConvertPointToView(src, dst, point);
   return dst->HitTest(*point);
@@ skipping 245 matching lines @@
 const Browser* BrowserViewLayout::browser() const {
   return browser_view_->browser();
 }
 
 int BrowserViewLayout::LayoutTabStripRegion() {
   if (!browser_view_->IsTabStripVisible()) {
     tabstrip_->SetVisible(false);
     tabstrip_->SetBounds(0, 0, 0, 0);
     return 0;
   }
-
   // This retrieves the bounds for the tab strip based on whether or not we show
   // anything to the left of it, like the incognito avatar.
   gfx::Rect tabstrip_bounds(
       browser_view_->frame()->GetBoundsForTabStrip(tabstrip_));
   gfx::Point tabstrip_origin(tabstrip_bounds.origin());
   views::View::ConvertPointToView(browser_view_->parent(), browser_view_,
                                   &tabstrip_origin);
   tabstrip_bounds.set_origin(tabstrip_origin);
 
   tabstrip_->SetVisible(true);
   tabstrip_->SetBoundsRect(tabstrip_bounds);
-  return tabstrip_bounds.bottom();
+  int bottom = tabstrip_bounds.bottom();
+
+  // The metro window switcher sits at the far right edge of the tabstrip
+  // a |kWindowSwitcherOffsetY| pixels above the base of the tabstrip.
+  views::Button* switcher_button = browser_view_->window_switcher_button_;
+  if (switcher_button) {
+    int width = browser_view_->width();
+    gfx::Size ps = switcher_button->GetPreferredSize();
+    if (width > ps.width()) {
+      switcher_button->SetBounds(width - ps.width() - kWindowSwitcherOffsetX, 0,
+                                 ps.width(), ps.height());
+    }
+  }

[cpu_(ooo_6.6-7.5), 2012/05/16 01:31:37]

the Y offset, currently 0 might end up being calculated, based on the |bottom|
minus stuff. Right now it is not

+
+  return bottom;
 }
 
 int BrowserViewLayout::LayoutToolbar(int top) {
   int browser_view_width = vertical_layout_rect_.width();
   bool toolbar_visible = browser_view_->IsToolbarVisible();
   toolbar_->location_bar()->SetLocationEntryFocusable(toolbar_visible);
   int y = top;
   y -= (toolbar_visible && browser_view_->IsTabStripVisible()) ?
         kToolbarTabStripVerticalOverlap : 0;
   int height = toolbar_visible ? toolbar_->GetPreferredSize().height() : 0;
@@ skipping 121 matching lines @@
     bottom -= height;
   }
   return bottom;
 }
 
 bool BrowserViewLayout::InfobarVisible() const {
   // NOTE: Can't check if the size IsEmpty() since it's always 0-width.
   return browser()->SupportsWindowFeature(Browser::FEATURE_INFOBAR) &&
       (infobar_container_->GetPreferredSize().height() != 0);
 }