Show avatar icon on V2 app's frame

ash/frame/custom_frame_view_ash_unittest.cc

 // Copyright 2014 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 "ash/frame/custom_frame_view_ash.h"
 
+#include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
+#include "ash/test/test_session_state_delegate.h"
 #include "base/memory/scoped_ptr.h"
 #include "grit/ash_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
 namespace ash {
 
 // A views::WidgetDelegate which uses a CustomFrameViewAsh.
@@ skipping 72 matching lines @@
     scoped_ptr<views::Widget> widget(new views::Widget);
     views::Widget::InitParams params;
     params.delegate = delegate;
     params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
     params.bounds = gfx::Rect(0, 0, 100, 100);
     params.context = CurrentContext();
     widget->Init(params);
     return widget.Pass();
   }
 
+  test::TestSessionStateDelegate* GetTestSessionStateDelegate() {
+    return static_cast<ash::test::TestSessionStateDelegate*>(
+        Shell::GetInstance()->session_state_delegate());
+  }
+
  private:
   DISALLOW_COPY_AND_ASSIGN(CustomFrameViewAshTest);
 };
 
 // Test that the height of the header is correct upon initially displaying
 // the widget.
 TEST_F(CustomFrameViewAshTest, HeaderHeight) {
   TestWidgetDelegate* delegate = new TestWidgetDelegate;
 
   scoped_ptr<views::Widget> widget(CreateWidget(delegate));
@@ skipping 51 matching lines @@
   gfx::Size max_frame_size = custom_frame_view->GetMaximumSize();
 
   EXPECT_EQ(min_client_size.width(), min_frame_size.width());
   EXPECT_EQ(max_client_size.width(), max_frame_size.width());
   EXPECT_EQ(min_client_size.height() + delegate->GetTitleBarHeight(),
             min_frame_size.height());
   EXPECT_EQ(max_client_size.height() + delegate->GetTitleBarHeight(),
             max_frame_size.height());
 }
 
+// Verify that CustomFrameViewAsh updates the avatar icon based on the
+// state of the SessionStateDelegate after visibility change.
+TEST_F(CustomFrameViewAshTest, AvatarIcon) {
+  TestWidgetConstraintsDelegate* delegate = new TestWidgetConstraintsDelegate;
+  scoped_ptr<views::Widget> widget(CreateWidget(delegate));
+
+  CustomFrameViewAsh* custom_frame_view = delegate->custom_frame_view();
+  EXPECT_FALSE(custom_frame_view->GetAvatarIconViewForTest());
+
+  // Avatar icon becomes available.

[pkotwicz, 2014/03/18 04:41:15]

How about: "Avatar image becomes available."

[oshima, 2014/03/18 14:57:03]

Done.

+  const gfx::ImageSkia user_image =
+      *ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
+          IDR_AURA_UBER_TRAY_GUEST_ICON);
+  GetTestSessionStateDelegate()->SetUserImage(user_image);
+  widget->Hide();
+  widget->Show();
+  EXPECT_TRUE(custom_frame_view->GetAvatarIconViewForTest());
+
+  // Avatar icon is gone, so is the avatar icon.

[pkotwicz, 2014/03/18 04:41:15]

How about: "Avatar image is gone; the ImageView should be removed from the
header."

[oshima, 2014/03/18 14:57:03]

Done.

+  GetTestSessionStateDelegate()->SetUserImage(gfx::ImageSkia());
+  widget->Hide();
+  widget->Show();
+  EXPECT_FALSE(custom_frame_view->GetAvatarIconViewForTest());
+}
+
 }  // namespace ash