Show avatar icon on V2 app's frame

ash/session_state_delegate_stub.cc

 // Copyright (c) 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 "ash/session_state_delegate_stub.h"
 
 #include "ash/shell.h"
 #include "ash/shell/example_factory.h"
+#include "ash/shell_delegate.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 
 namespace ash {
 
 SessionStateDelegateStub::SessionStateDelegateStub() : screen_locked_(false) {
 }
 
 SessionStateDelegateStub::~SessionStateDelegateStub() {
 }
 
 content::BrowserContext*
 SessionStateDelegateStub::GetBrowserContextByIndex(
     MultiProfileIndex index) {
-  return NULL;
+  return Shell::GetInstance()->delegate()->GetActiveBrowserContext();
+}
+
+content::BrowserContext*
+SessionStateDelegateStub::GetBrowserContextForWindow(
+    aura::Window* window) {
+  return Shell::GetInstance()->delegate()->GetActiveBrowserContext();
 }
 
 int SessionStateDelegateStub::GetMaximumNumberOfLoggedInUsers() const {
   return 3;
 }
 
 int SessionStateDelegateStub::NumberOfLoggedInUsers() const {
   return 1;
 }
 
@@ skipping 38 matching lines @@
   return "stub-user@domain.com";
 }
 
 const std::string SessionStateDelegateStub::GetUserID(
     MultiProfileIndex index) const {
   return GetUserEmail(index);
 }
 
 const gfx::ImageSkia& SessionStateDelegateStub::GetUserImage(
     content::BrowserContext* context) const {
-  return null_image_;
+  return user_image_;
 }
 
 bool SessionStateDelegateStub::ShouldShowAvatar(aura::Window* window) {
-  return false;
+  return !user_image_.isNull();
 }
 
 void SessionStateDelegateStub::SwitchActiveUser(const std::string& user_id) {
 }
 
 void SessionStateDelegateStub::CycleActiveUser(CycleUser cycle_user) {
 }
 
 void SessionStateDelegateStub::AddSessionStateObserver(
     ash::SessionStateObserver* observer) {
 }
 
 void SessionStateDelegateStub::RemoveSessionStateObserver(
     ash::SessionStateObserver* observer) {
 }
 
 }  // namespace ash