Redesign of the avatar menu button.

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/basictypes.h"
+#include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/views/tab_icon_view.h"
 #include "chrome/browser/ui/views/tabs/tab.h"
+#include "chrome/common/chrome_switches.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/image/image_skia_rep.h"
 #include "ui/gfx/text_constants.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/test/views_test_base.h"
 
 using views::Widget;
 
@@ skipping 52 matching lines @@
 
   virtual gfx::Size GetBrowserViewMinimumSize() const OVERRIDE {
     // Taken from a calculation in BrowserViewLayout.
     return gfx::Size(168, 64);
   }
 
   virtual bool ShouldShowAvatar() const OVERRIDE {
     return show_avatar_;
   }
 
+  virtual bool IsRegularOrGuestSession() const {
+    return true;
+  }
+
   virtual gfx::ImageSkia GetOTRAvatarIcon() const OVERRIDE {
     // The calculations depend on the size of the OTR resource, and chromeos
     // uses a different sized image, so hard code the size of the current
     // windows/linux one.
     gfx::ImageSkiaRep rep(gfx::Size(40, 29), 1.0f);
     gfx::ImageSkia image(rep);
     return image;
   }
 
   virtual bool IsMaximized() const OVERRIDE {
@@ skipping 113 matching lines @@
 
   void AddAvatarLabel() {
     avatar_label_ = new views::MenuButton(NULL, string16(), NULL, false);
     avatar_label_->set_id(VIEW_ID_AVATAR_LABEL);
     root_view_->AddChildView(avatar_label_);
 
     // The avatar label should only be used together with the avatar button.
     AddAvatarButton();
   }
 
+  void AddNewAvatarButton() {
+   new_avatar_button_ = new views::MenuButton(NULL, string16(), NULL, false);
+   new_avatar_button_->set_id(VIEW_ID_NEW_AVATAR_BUTTON);
+   root_view_->AddChildView(new_avatar_button_);
+  }
+
   void ExpectBasicWindowBounds() {
     EXPECT_EQ("428,1 25x18", maximize_button_->bounds().ToString());
     EXPECT_EQ("402,1 26x18", minimize_button_->bounds().ToString());
     EXPECT_EQ("0,0 0x0", restore_button_->bounds().ToString());
     EXPECT_EQ("453,1 43x18", close_button_->bounds().ToString());
   }
 
   gfx::Font default_font_;
 
   Widget* widget_;
   views::View* root_view_;
   OpaqueBrowserFrameViewLayout* layout_manager_;
   scoped_ptr<TestLayoutDelegate> delegate_;
 
   // Widgets:
   views::ImageButton* minimize_button_;
   views::ImageButton* maximize_button_;
   views::ImageButton* restore_button_;
   views::ImageButton* close_button_;
 
   TabIconView* tab_icon_view_;
   views::Label* window_title_;
 
   views::MenuButton* menu_button_;
   views::MenuButton* avatar_label_;
+  views::MenuButton* new_avatar_button_;
 
   DISALLOW_COPY_AND_ASSIGN(OpaqueBrowserFrameViewLayoutTest);
 };
 
 TEST_F(OpaqueBrowserFrameViewLayoutTest, BasicWindow) {
   // Tests the layout of a default chrome window with no avatars, no window
   // titles, and a tabstrip.
   root_view_->Layout();
 
   ExpectBasicWindowBounds();
@@ skipping 56 matching lines @@
   ExpectBasicWindowBounds();
 
   // Check the location of the avatar
   EXPECT_EQ("7,11 40x29", menu_button_->bounds().ToString());
   EXPECT_EQ("45,13 352x29",
             layout_manager_->GetBoundsForTabStrip(
                 delegate_->GetTabstripPreferredSize(), kWidth).ToString());
   EXPECT_EQ("261x73", layout_manager_->GetMinimumSize(kWidth).ToString());
 }
 
+
+TEST_F(OpaqueBrowserFrameViewLayoutTest, WindowWithNewAvatar) {
+  CommandLine::ForCurrentProcess()->AppendSwitch(
+      switches::kNewProfileManagement);

[Elliot Glaysher, 2013/10/03 21:52:53]

Isn't this permanently changing the command line? If not, where does this get
reset? base::TestSuite::~TestSuite() runs CommandLine::Reset(), but that looks
like its once at shutdown, not per test...

[noms (inactive), 2013/10/07 21:18:15]

The TestClientInitializer has two functions, OnTestStart and OnTestEnd which
backup and restore the command line for the current process. This means that
whatever command line changes you do in a test, they get reverted at the end of
the test.

On 2013/10/03 21:52:53, Elliot Glaysher wrote:

+
+  // Tests a normal tabstrip window with the new style avatar icon.
+  AddNewAvatarButton();
+  root_view_->Layout();
+
+  ExpectBasicWindowBounds();
+
+  // Check the location of the caption button
+  EXPECT_EQ("385,1 12x20", new_avatar_button_->bounds().ToString());
+  // The basic window bounds are (-1, 13 398x29). There should not be an icon
+  // avatar in the left, and the new avatar button has an offset of 5 to its
+  // next control.
+  EXPECT_EQ("-1,13 381x29",
+            layout_manager_->GetBoundsForTabStrip(
+                delegate_->GetTabstripPreferredSize(), kWidth).ToString());
+  EXPECT_EQ("261x73", layout_manager_->GetMinimumSize(kWidth).ToString());
+}
+
 TEST_F(OpaqueBrowserFrameViewLayoutTest, WindowWithAvatarLabelAndButton) {
   AddAvatarLabel();
   root_view_->Layout();
 
   ExpectBasicWindowBounds();
 
   // Check the location of the avatar label relative to the avatar button.
   // The label height and width depends on the font size and the text displayed.
   // This may possibly change, so we don't test it here.
   EXPECT_EQ(menu_button_->bounds().x() - 2, avatar_label_->bounds().x());
   EXPECT_EQ(
       menu_button_->bounds().bottom() - 3 - avatar_label_->bounds().height(),
       avatar_label_->bounds().y());
 }