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

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

Issue 1428213004: This CL replaces std::string user_id in ash/* with AccountId. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update after review. Created 5 years, 1 month 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_observer.h ('k') | ash/system/tray/system_tray_delegate.h » ('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/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 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 } 110 }
111 const user_manager::UserInfo* GetUserInfo(UserIndex index) const override { 111 const user_manager::UserInfo* GetUserInfo(UserIndex index) const override {
112 return user_info_.get(); 112 return user_info_.get();
113 } 113 }
114 bool ShouldShowAvatar(aura::Window* window) const override { 114 bool ShouldShowAvatar(aura::Window* window) const override {
115 return !user_info_->GetImage().isNull(); 115 return !user_info_->GetImage().isNull();
116 } 116 }
117 gfx::ImageSkia GetAvatarImageForWindow(aura::Window* window) const override { 117 gfx::ImageSkia GetAvatarImageForWindow(aura::Window* window) const override {
118 return gfx::ImageSkia(); 118 return gfx::ImageSkia();
119 } 119 }
120 void SwitchActiveUser(const std::string& user_id) override {} 120 void SwitchActiveUser(const AccountId& account_id) override {}
121 void CycleActiveUser(CycleUser cycle_user) override {} 121 void CycleActiveUser(CycleUser cycle_user) override {}
122 bool IsMultiProfileAllowedByPrimaryUserPolicy() const override { 122 bool IsMultiProfileAllowedByPrimaryUserPolicy() const override {
123 return true; 123 return true;
124 } 124 }
125 void AddSessionStateObserver(ash::SessionStateObserver* observer) override {} 125 void AddSessionStateObserver(ash::SessionStateObserver* observer) override {}
126 void RemoveSessionStateObserver( 126 void RemoveSessionStateObserver(
127 ash::SessionStateObserver* observer) override {} 127 ash::SessionStateObserver* observer) override {}
128 128
129 private: 129 private:
130 bool screen_locked_; 130 bool screen_locked_;
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 base::string16 ShellDelegateImpl::GetProductName() const { 252 base::string16 ShellDelegateImpl::GetProductName() const {
253 return base::string16(); 253 return base::string16();
254 } 254 }
255 255
256 gfx::Image ShellDelegateImpl::GetDeprecatedAcceleratorImage() const { 256 gfx::Image ShellDelegateImpl::GetDeprecatedAcceleratorImage() const {
257 return gfx::Image(); 257 return gfx::Image();
258 } 258 }
259 259
260 } // namespace shell 260 } // namespace shell
261 } // namespace ash 261 } // namespace ash
OLDNEW
« no previous file with comments | « ash/session/session_state_observer.h ('k') | ash/system/tray/system_tray_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698