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

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

Issue 374853002: Providing more information on why certain users can't be added to multi-profile (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Minor fix Created 6 years, 4 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/system/user/user_view.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/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 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 } 121 }
122 virtual const user_manager::UserInfo* GetUserInfo( 122 virtual const user_manager::UserInfo* GetUserInfo(
123 content::BrowserContext* context) const OVERRIDE { 123 content::BrowserContext* context) const OVERRIDE {
124 return user_info_.get(); 124 return user_info_.get();
125 } 125 }
126 virtual bool ShouldShowAvatar(aura::Window* window) const OVERRIDE { 126 virtual bool ShouldShowAvatar(aura::Window* window) const OVERRIDE {
127 return !user_info_->GetImage().isNull(); 127 return !user_info_->GetImage().isNull();
128 } 128 }
129 virtual void SwitchActiveUser(const std::string& user_id) OVERRIDE {} 129 virtual void SwitchActiveUser(const std::string& user_id) OVERRIDE {}
130 virtual void CycleActiveUser(CycleUser cycle_user) OVERRIDE {} 130 virtual void CycleActiveUser(CycleUser cycle_user) OVERRIDE {}
131 virtual bool IsMultiProfileAllowedByPrimaryUserPolicy() const OVERRIDE {
132 return true;
133 }
131 virtual void AddSessionStateObserver( 134 virtual void AddSessionStateObserver(
132 ash::SessionStateObserver* observer) OVERRIDE {} 135 ash::SessionStateObserver* observer) OVERRIDE {}
133 virtual void RemoveSessionStateObserver( 136 virtual void RemoveSessionStateObserver(
134 ash::SessionStateObserver* observer) OVERRIDE {} 137 ash::SessionStateObserver* observer) OVERRIDE {}
135 138
136 private: 139 private:
137 bool screen_locked_; 140 bool screen_locked_;
138 141
139 // A pseudo user info. 142 // A pseudo user info.
140 scoped_ptr<user_manager::UserInfo> user_info_; 143 scoped_ptr<user_manager::UserInfo> user_info_;
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
253 // Real GPU support depends on src/content, so just use a stub. 256 // Real GPU support depends on src/content, so just use a stub.
254 return new GPUSupportStub; 257 return new GPUSupportStub;
255 } 258 }
256 259
257 base::string16 ShellDelegateImpl::GetProductName() const { 260 base::string16 ShellDelegateImpl::GetProductName() const {
258 return base::string16(); 261 return base::string16();
259 } 262 }
260 263
261 } // namespace shell 264 } // namespace shell
262 } // namespace ash 265 } // namespace ash
OLDNEW
« no previous file with comments | « ash/session/session_state_delegate.h ('k') | ash/system/user/user_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698