Fix opaque frame incognito icon and tabstrip positioning.

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

 // Copyright 2013 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_layout.h"
 
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/views/profiles/avatar_menu_button.h"
@@ skipping 97 matching lines @@
     return IsTabStripVisible() ? Tab::GetMinimumInactiveSize().height() : 0;
   }
 
   bool IsToolbarVisible() const override { return true; }
 
   gfx::Size GetTabstripPreferredSize() const override {
     // Measured from Tabstrip::GetPreferredSize().
     return IsTabStripVisible() ? gfx::Size(78, 29) : gfx::Size(0, 0);
   }
 
+  int GetToolbarLeadingCornerClientWidth() const override {
+    return 0;
+  }
+
  private:
   base::string16 window_title_;
   bool show_avatar_;
   bool show_caption_buttons_;
   WindowState window_state_;
 
   DISALLOW_COPY_AND_ASSIGN(TestLayoutDelegate);
 };
 
 }  // namespace
@@ skipping 126 matching lines @@
   delegate_->SetWindowState(TestLayoutDelegate::STATE_MAXIMIZED);
   root_view_->Layout();
 
   // Note how the bounds start at the exact top of the window while maximized
   // while they start 1 pixel below when unmaximized.
   EXPECT_EQ("0,0 0x0", maximize_button_->bounds().ToString());
   EXPECT_EQ("403,0 26x18", minimize_button_->bounds().ToString());
   EXPECT_EQ("429,0 25x18", restore_button_->bounds().ToString());
   EXPECT_EQ("454,0 46x18", close_button_->bounds().ToString());
 
-  EXPECT_EQ("-5,-3 392x29",
+  EXPECT_EQ("-6,-3 393x29",
             layout_manager_->GetBoundsForTabStrip(
                 delegate_->GetTabstripPreferredSize(), kWidth).ToString());
   EXPECT_EQ("262x61", layout_manager_->GetMinimumSize(kWidth).ToString());
 
   // In the maximized case, OpaqueBrowserFrameView::NonClientHitTest() uses
   // this rect, extended to the top left corner of the window.
   EXPECT_EQ("2,0 17x17", layout_manager_->IconBounds().ToString());
 }
 
 TEST_F(OpaqueBrowserFrameViewLayoutTest, MaximizedWithYOffset) {
   // Tests the layout of a basic chrome window with the caption buttons slightly
   // offset from the top of the screen (as they are on Linux).
   layout_manager_->set_extra_caption_y(2);
   delegate_->SetWindowState(TestLayoutDelegate::STATE_MAXIMIZED);
   root_view_->Layout();
 
   // Note how the bounds start at the exact top of the window, DESPITE the
   // caption Y offset of 2. This ensures that we obey Fitts' Law (the buttons
   // are clickable on the top edge of the screen). However, the buttons are 2
   // pixels taller, so the images appear to be offset by 2 pixels.
   EXPECT_EQ("0,0 0x0", maximize_button_->bounds().ToString());
   EXPECT_EQ("403,0 26x20", minimize_button_->bounds().ToString());
   EXPECT_EQ("429,0 25x20", restore_button_->bounds().ToString());
   EXPECT_EQ("454,0 46x20", close_button_->bounds().ToString());
 
-  EXPECT_EQ("-5,-3 392x29",
+  EXPECT_EQ("-6,-3 393x29",
             layout_manager_->GetBoundsForTabStrip(
                 delegate_->GetTabstripPreferredSize(), kWidth).ToString());
   EXPECT_EQ("262x61", layout_manager_->GetMinimumSize(kWidth).ToString());
 
   // In the maximized case, OpaqueBrowserFrameView::NonClientHitTest() uses
   // this rect, extended to the top left corner of the window.
   EXPECT_EQ("2,0 17x17", layout_manager_->IconBounds().ToString());
 }
 
 TEST_F(OpaqueBrowserFrameViewLayoutTest, WindowButtonsOnLeft) {
   // Tests the layout of a chrome window with caption buttons on the left.
   std::vector<views::FrameButton> leading_buttons;
   std::vector<views::FrameButton> trailing_buttons;
   leading_buttons.push_back(views::FRAME_BUTTON_CLOSE);
   leading_buttons.push_back(views::FRAME_BUTTON_MINIMIZE);
   leading_buttons.push_back(views::FRAME_BUTTON_MAXIMIZE);
   layout_manager_->SetButtonOrdering(leading_buttons, trailing_buttons);
   root_view_->Layout();
 
   EXPECT_EQ("73,1 25x18", maximize_button_->bounds().ToString());
   EXPECT_EQ("47,1 26x18", minimize_button_->bounds().ToString());
   EXPECT_EQ("0,0 0x0", restore_button_->bounds().ToString());
   EXPECT_EQ("4,1 43x18", close_button_->bounds().ToString());
 
-  EXPECT_EQ("93,13 398x29",
+  EXPECT_EQ("92,13 398x29",
             layout_manager_->GetBoundsForTabStrip(
                 delegate_->GetTabstripPreferredSize(), kWidth).ToString());
   EXPECT_EQ("261x73", layout_manager_->GetMinimumSize(kWidth).ToString());
 
   // If the buttons are on the left, there should be no hidden icon for the user
   // to double click.
   EXPECT_EQ("0,0 0x0", layout_manager_->IconBounds().ToString());
 }
 
 TEST_F(OpaqueBrowserFrameViewLayoutTest, WithoutCaptionButtons) {
   // Tests the layout of a default chrome window with no caption buttons (which
   // should force the tab strip to be condensed).
   delegate_->SetShouldShowCaptionButtons(false);
   root_view_->Layout();
 
   EXPECT_EQ("0,0 0x0", maximize_button_->bounds().ToString());
   EXPECT_EQ("0,0 0x0", minimize_button_->bounds().ToString());
   EXPECT_EQ("0,0 0x0", restore_button_->bounds().ToString());
   EXPECT_EQ("0,0 0x0", close_button_->bounds().ToString());
 
-  EXPECT_EQ("-5,-3 500x29",
+  EXPECT_EQ("-6,-3 501x29",
             layout_manager_->GetBoundsForTabStrip(
                 delegate_->GetTabstripPreferredSize(), kWidth).ToString());
   EXPECT_EQ("251x61", layout_manager_->GetMinimumSize(kWidth).ToString());
 
   // A normal window with no window icon still produces icon bounds for
   // Windows, which has a hidden icon that a user can double click on to close
   // the window.
   EXPECT_EQ("2,0 17x17", layout_manager_->IconBounds().ToString());
 }
 
 TEST_F(OpaqueBrowserFrameViewLayoutTest, MaximizedWithoutCaptionButtons) {
   // Tests the layout of a maximized chrome window with no caption buttons.
   delegate_->SetWindowState(TestLayoutDelegate::STATE_MAXIMIZED);
   delegate_->SetShouldShowCaptionButtons(false);
   root_view_->Layout();
 
   EXPECT_EQ("0,0 0x0", maximize_button_->bounds().ToString());
   EXPECT_EQ("0,0 0x0", minimize_button_->bounds().ToString());
   EXPECT_EQ("0,0 0x0", restore_button_->bounds().ToString());
   EXPECT_EQ("0,0 0x0", close_button_->bounds().ToString());
 
-  EXPECT_EQ("-5,-3 500x29",
+  EXPECT_EQ("-6,-3 501x29",
             layout_manager_->GetBoundsForTabStrip(
                 delegate_->GetTabstripPreferredSize(), kWidth).ToString());
   EXPECT_EQ("251x61", layout_manager_->GetMinimumSize(kWidth).ToString());
 
   // In the maximized case, OpaqueBrowserFrameView::NonClientHitTest() uses
   // this rect, extended to the top left corner of the window.
   EXPECT_EQ("2,0 17x17", layout_manager_->IconBounds().ToString());
 }
 
 TEST_F(OpaqueBrowserFrameViewLayoutTest, WithWindowTitleAndIcon) {
@@ skipping 19 matching lines @@
 
   // Check the location of the avatar button.
   EXPECT_EQ("385,1 12x18", new_avatar_button_->bounds().ToString());
   // The new tab button is 39px wide and slides completely under the new
   // avatar button, thus increasing the tabstrip by that amount.
   EXPECT_EQ("-1,13 420x29",
             layout_manager_->GetBoundsForTabStrip(
                 delegate_->GetTabstripPreferredSize(), kWidth).ToString());
   EXPECT_EQ("261x73", layout_manager_->GetMinimumSize(kWidth).ToString());
 }