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 560033002: Fixed suggesting adding more users into multi-profile session when we don't have more (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 } 85 }
86 virtual content::BrowserContext* GetBrowserContextForWindow( 86 virtual content::BrowserContext* GetBrowserContextForWindow(
87 aura::Window* window) OVERRIDE { 87 aura::Window* window) OVERRIDE {
88 return Shell::GetInstance()->delegate()->GetActiveBrowserContext(); 88 return Shell::GetInstance()->delegate()->GetActiveBrowserContext();
89 } 89 }
90 virtual int GetMaximumNumberOfLoggedInUsers() const OVERRIDE { return 3; } 90 virtual int GetMaximumNumberOfLoggedInUsers() const OVERRIDE { return 3; }
91 virtual int NumberOfLoggedInUsers() const OVERRIDE { 91 virtual int NumberOfLoggedInUsers() const OVERRIDE {
92 // ash_shell has 2 users. 92 // ash_shell has 2 users.
93 return 2; 93 return 2;
94 } 94 }
95 virtual int GetNumberOfAdmittedForMultiProfileUsers() const OVERRIDE {
96 return GetMaximumNumberOfLoggedInUsers() - NumberOfLoggedInUsers();
97 }
95 virtual bool IsActiveUserSessionStarted() const OVERRIDE { return true; } 98 virtual bool IsActiveUserSessionStarted() const OVERRIDE { return true; }
96 virtual bool CanLockScreen() const OVERRIDE { return true; } 99 virtual bool CanLockScreen() const OVERRIDE { return true; }
97 virtual bool IsScreenLocked() const OVERRIDE { return screen_locked_; } 100 virtual bool IsScreenLocked() const OVERRIDE { return screen_locked_; }
98 virtual bool ShouldLockScreenBeforeSuspending() const OVERRIDE { 101 virtual bool ShouldLockScreenBeforeSuspending() const OVERRIDE {
99 return false; 102 return false;
100 } 103 }
101 virtual void LockScreen() OVERRIDE { 104 virtual void LockScreen() OVERRIDE {
102 shell::CreateLockScreen(); 105 shell::CreateLockScreen();
103 screen_locked_ = true; 106 screen_locked_ = true;
104 Shell::GetInstance()->UpdateShelfVisibility(); 107 Shell::GetInstance()->UpdateShelfVisibility();
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 // Real GPU support depends on src/content, so just use a stub. 259 // Real GPU support depends on src/content, so just use a stub.
257 return new GPUSupportStub; 260 return new GPUSupportStub;
258 } 261 }
259 262
260 base::string16 ShellDelegateImpl::GetProductName() const { 263 base::string16 ShellDelegateImpl::GetProductName() const {
261 return base::string16(); 264 return base::string16();
262 } 265 }
263 266
264 } // namespace shell 267 } // namespace shell
265 } // namespace ash 268 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698