Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1199)

Unified Diff: ash/shell/shell_delegate_impl.cc

Issue 2910773002: cros: CustomFrameViewAsh avatar icon from a window prop (Closed)
Patch Set: add test Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/shell/shell_delegate_impl.h ('k') | ash/shell_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell/shell_delegate_impl.cc
diff --git a/ash/shell/shell_delegate_impl.cc b/ash/shell/shell_delegate_impl.cc
index e9112bac622fa58e48c0fb014306e3919a763860..6958fe8310feb8140f4e8544622b1b9149af4500 100644
--- a/ash/shell/shell_delegate_impl.cc
+++ b/ash/shell/shell_delegate_impl.cc
@@ -10,7 +10,6 @@
#include "ash/gpu_support_stub.h"
#include "ash/palette_delegate.h"
#include "ash/public/cpp/shell_window_ids.h"
-#include "ash/session/session_state_delegate.h"
#include "ash/shell.h"
#include "ash/shell/context_menu.h"
#include "ash/shell/example_factory.h"
@@ -59,27 +58,6 @@ class PaletteDelegateImpl : public PaletteDelegate {
DISALLOW_COPY_AND_ASSIGN(PaletteDelegateImpl);
};
-class SessionStateDelegateImpl : public SessionStateDelegate {
- public:
- SessionStateDelegateImpl() : user_info_(new user_manager::UserInfoImpl()) {}
-
- ~SessionStateDelegateImpl() override {}
-
- // SessionStateDelegate:
- bool ShouldShowAvatar(WmWindow* window) const override {
- return !user_info_->GetImage().isNull();
- }
- gfx::ImageSkia GetAvatarImageForWindow(WmWindow* window) const override {
- return gfx::ImageSkia();
- }
-
- private:
- // A pseudo user info.
- std::unique_ptr<user_manager::UserInfo> user_info_;
-
- DISALLOW_COPY_AND_ASSIGN(SessionStateDelegateImpl);
-};
-
} // namespace
ShellDelegateImpl::ShellDelegateImpl() {}
@@ -137,10 +115,6 @@ ShellDelegateImpl::CreateWallpaperDelegate() {
return base::MakeUnique<DefaultWallpaperDelegate>();
}
-SessionStateDelegate* ShellDelegateImpl::CreateSessionStateDelegate() {
- return new SessionStateDelegateImpl;
-}
-
AccessibilityDelegate* ShellDelegateImpl::CreateAccessibilityDelegate() {
return new DefaultAccessibilityDelegate;
}
« no previous file with comments | « ash/shell/shell_delegate_impl.h ('k') | ash/shell_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698