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

Side by Side Diff: ash/shell/shell_delegate_impl.cc

Issue 2042333002: mash: Migrate SessionStateDelegate interface to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove semicolon Created 4 years, 6 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 unified diff | Download patch
« no previous file with comments | « ash/session/session_state_delegate.h ('k') | ash/sysui/shell_delegate_mus.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/shell/shell_delegate_impl.h" 5 #include "ash/shell/shell_delegate_impl.h"
6 6
7 #include "ash/accessibility_delegate.h" 7 #include "ash/accessibility_delegate.h"
8 #include "ash/app_list/app_list_presenter_delegate_factory.h" 8 #include "ash/app_list/app_list_presenter_delegate_factory.h"
9 #include "ash/common/shell_window_ids.h" 9 #include "ash/common/shell_window_ids.h"
10 #include "ash/common/wm/window_state.h" 10 #include "ash/common/wm/window_state.h"
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 return !IsActiveUserSessionStarted() || IsScreenLocked(); 109 return !IsActiveUserSessionStarted() || IsScreenLocked();
110 } 110 }
111 SessionState GetSessionState() const override { 111 SessionState GetSessionState() const override {
112 // Assume that if session is not active we're at login. 112 // Assume that if session is not active we're at login.
113 return IsActiveUserSessionStarted() ? SESSION_STATE_ACTIVE 113 return IsActiveUserSessionStarted() ? SESSION_STATE_ACTIVE
114 : SESSION_STATE_LOGIN_PRIMARY; 114 : SESSION_STATE_LOGIN_PRIMARY;
115 } 115 }
116 const user_manager::UserInfo* GetUserInfo(UserIndex index) const override { 116 const user_manager::UserInfo* GetUserInfo(UserIndex index) const override {
117 return user_info_.get(); 117 return user_info_.get();
118 } 118 }
119 bool ShouldShowAvatar(aura::Window* window) const override { 119 bool ShouldShowAvatar(WmWindow* window) const override {
120 return !user_info_->GetImage().isNull(); 120 return !user_info_->GetImage().isNull();
121 } 121 }
122 gfx::ImageSkia GetAvatarImageForWindow(aura::Window* window) const override { 122 gfx::ImageSkia GetAvatarImageForWindow(WmWindow* window) const override {
123 return gfx::ImageSkia(); 123 return gfx::ImageSkia();
124 } 124 }
125 void SwitchActiveUser(const AccountId& account_id) override {} 125 void SwitchActiveUser(const AccountId& account_id) override {}
126 void CycleActiveUser(CycleUser cycle_user) override {} 126 void CycleActiveUser(CycleUser cycle_user) override {}
127 bool IsMultiProfileAllowedByPrimaryUserPolicy() const override { 127 bool IsMultiProfileAllowedByPrimaryUserPolicy() const override {
128 return true; 128 return true;
129 } 129 }
130 void AddSessionStateObserver(ash::SessionStateObserver* observer) override {} 130 void AddSessionStateObserver(ash::SessionStateObserver* observer) override {}
131 void RemoveSessionStateObserver( 131 void RemoveSessionStateObserver(
132 ash::SessionStateObserver* observer) override {} 132 ash::SessionStateObserver* observer) override {}
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
280 base::string16 ShellDelegateImpl::GetProductName() const { 280 base::string16 ShellDelegateImpl::GetProductName() const {
281 return base::string16(); 281 return base::string16();
282 } 282 }
283 283
284 gfx::Image ShellDelegateImpl::GetDeprecatedAcceleratorImage() const { 284 gfx::Image ShellDelegateImpl::GetDeprecatedAcceleratorImage() const {
285 return gfx::Image(); 285 return gfx::Image();
286 } 286 }
287 287
288 } // namespace shell 288 } // namespace shell
289 } // namespace ash 289 } // namespace ash
OLDNEW
« no previous file with comments | « ash/session/session_state_delegate.h ('k') | ash/sysui/shell_delegate_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698