Extract content-specific aspects of SessionStateDelegate onto ShellContentState.

R=sky@chromium.org
http://crbug.com/332504

Review URL: https://codereview.chromium.org/1377343003

Cr-Commit-Position: refs/heads/master@{#352381}

3 files changed, 27 insertions, 20 deletions

diff --git a/ash/shell/content/shell_content_state_impl.cc b/ash/shell/content/shell_content_state_impl.cc
index f1566e4..fa40503 100644
--- a/ash/shell/content/shell_content_state_impl.cc
+++ b/ash/shell/content/shell_content_state_impl.cc
@@ -16,4 +16,20 @@ content::BrowserContext* ShellContentStateImpl::GetActiveBrowserContext() {
   return browser_context_;
 }
 
+content::BrowserContext* ShellContentStateImpl::GetBrowserContextByIndex(
+    UserIndex index) {
+  return browser_context_;
+}
+
+content::BrowserContext* ShellContentStateImpl::GetBrowserContextForWindow(
+    aura::Window* window) {
+  return browser_context_;
+}
+
+content::BrowserContext*
+ShellContentStateImpl::GetUserPresentingBrowserContextForWindow(
+    aura::Window* window) {
+  return browser_context_;
+}
+
 }  // namespace ash
diff --git a/ash/shell/content/shell_content_state_impl.h b/ash/shell/content/shell_content_state_impl.h
index 645e7e3..eba8578 100644
--- a/ash/shell/content/shell_content_state_impl.h
+++ b/ash/shell/content/shell_content_state_impl.h
@@ -18,6 +18,11 @@ class ShellContentStateImpl : public ShellContentState {
 
   // Overridden from ShellContentState:
   content::BrowserContext* GetActiveBrowserContext() override;
+  content::BrowserContext* GetBrowserContextByIndex(UserIndex index) override;
+  content::BrowserContext* GetBrowserContextForWindow(
+      aura::Window* window) override;
+  content::BrowserContext* GetUserPresentingBrowserContextForWindow(
+      aura::Window* window) override;
 
   content::BrowserContext* browser_context_;
 
diff --git a/ash/shell/shell_delegate_impl.cc b/ash/shell/shell_delegate_impl.cc
index a72452fe..db062e0 100644
--- a/ash/shell/shell_delegate_impl.cc
+++ b/ash/shell/shell_delegate_impl.cc
@@ -26,6 +26,7 @@
 #include "ui/app_list/app_list_view_delegate.h"
 #include "ui/aura/window.h"
 #include "ui/gfx/image/image.h"
+#include "ui/gfx/image/image_skia.h"
 
 namespace ash {
 namespace shell {
@@ -65,8 +66,7 @@ class MediaDelegateImpl : public MediaDelegate {
   void HandleMediaNextTrack() override {}
   void HandleMediaPlayPause() override {}
   void HandleMediaPrevTrack() override {}
-  MediaCaptureState GetMediaCaptureState(
-      content::BrowserContext* context) override {
+  MediaCaptureState GetMediaCaptureState(UserIndex index) override {
     return MEDIA_CAPTURE_VIDEO;
   }
 
@@ -82,18 +82,6 @@ class SessionStateDelegateImpl : public SessionStateDelegate {
   ~SessionStateDelegateImpl() override {}
 
   // SessionStateDelegate:
-  content::BrowserContext* GetBrowserContextByIndex(
-      MultiProfileIndex index) override {
-    return ShellContentState::GetInstance()->GetActiveBrowserContext();
-  }
-  content::BrowserContext* GetBrowserContextForWindow(
-      aura::Window* window) override {
-    return ShellContentState::GetInstance()->GetActiveBrowserContext();
-  }
-  content::BrowserContext* GetUserPresentingBrowserContextForWindow(
-      aura::Window* window) override {
-    return NULL;
-  }
   int GetMaximumNumberOfLoggedInUsers() const override { return 3; }
   int NumberOfLoggedInUsers() const override {
     // ash_shell has 2 users.
@@ -120,17 +108,15 @@ class SessionStateDelegateImpl : public SessionStateDelegate {
     return IsActiveUserSessionStarted() ? SESSION_STATE_ACTIVE
                                         : SESSION_STATE_LOGIN_PRIMARY;
   }
-  const user_manager::UserInfo* GetUserInfo(
-      MultiProfileIndex index) const override {
-    return user_info_.get();
-  }
-  const user_manager::UserInfo* GetUserInfo(
-      content::BrowserContext* context) const override {
+  const user_manager::UserInfo* GetUserInfo(UserIndex index) const override {
     return user_info_.get();
   }
   bool ShouldShowAvatar(aura::Window* window) const override {
     return !user_info_->GetImage().isNull();
   }
+  gfx::ImageSkia GetAvatarImageForWindow(aura::Window* window) const override {
+    return gfx::ImageSkia();
+  }
   void SwitchActiveUser(const std::string& user_id) override {}
   void CycleActiveUser(CycleUser cycle_user) override {}
   bool IsMultiProfileAllowedByPrimaryUserPolicy() const override {