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

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

Issue 357323002: Tray elements behave appropriately on the multiple signin screen (more like lock screen) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed nits Created 6 years, 5 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
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/default_accessibility_delegate.h" 8 #include "ash/default_accessibility_delegate.h"
9 #include "ash/default_user_wallpaper_delegate.h" 9 #include "ash/default_user_wallpaper_delegate.h"
10 #include "ash/gpu_support_stub.h" 10 #include "ash/gpu_support_stub.h"
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 virtual bool ShouldShowAvatar(aura::Window* window) const OVERRIDE { 151 virtual bool ShouldShowAvatar(aura::Window* window) const OVERRIDE {
152 return !user_info_->GetImage().isNull(); 152 return !user_info_->GetImage().isNull();
153 } 153 }
154 virtual void SwitchActiveUser(const std::string& user_id) OVERRIDE {} 154 virtual void SwitchActiveUser(const std::string& user_id) OVERRIDE {}
155 virtual void CycleActiveUser(CycleUser cycle_user) OVERRIDE {} 155 virtual void CycleActiveUser(CycleUser cycle_user) OVERRIDE {}
156 virtual void AddSessionStateObserver( 156 virtual void AddSessionStateObserver(
157 ash::SessionStateObserver* observer) OVERRIDE {} 157 ash::SessionStateObserver* observer) OVERRIDE {}
158 virtual void RemoveSessionStateObserver( 158 virtual void RemoveSessionStateObserver(
159 ash::SessionStateObserver* observer) OVERRIDE {} 159 ash::SessionStateObserver* observer) OVERRIDE {}
160 160
161 virtual void HideMultiUserSigninScreen() OVERRIDE {}
162
161 private: 163 private:
162 bool screen_locked_; 164 bool screen_locked_;
163 165
164 // A pseudo user info. 166 // A pseudo user info.
165 scoped_ptr<UserInfo> user_info_; 167 scoped_ptr<UserInfo> user_info_;
166 168
167 DISALLOW_COPY_AND_ASSIGN(SessionStateDelegateImpl); 169 DISALLOW_COPY_AND_ASSIGN(SessionStateDelegateImpl);
168 }; 170 };
169 171
170 } // namespace 172 } // namespace
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
278 // Real GPU support depends on src/content, so just use a stub. 280 // Real GPU support depends on src/content, so just use a stub.
279 return new GPUSupportStub; 281 return new GPUSupportStub;
280 } 282 }
281 283
282 base::string16 ShellDelegateImpl::GetProductName() const { 284 base::string16 ShellDelegateImpl::GetProductName() const {
283 return base::string16(); 285 return base::string16();
284 } 286 }
285 287
286 } // namespace shell 288 } // namespace shell
287 } // namespace ash 289 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698