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

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

Issue 1053013007: Minimized windows should not be activated by another user in multiprofile scenario. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address skuhne@'s comments. Created 5 years, 8 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/test/test_session_state_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 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 82
83 // SessionStateDelegate: 83 // SessionStateDelegate:
84 content::BrowserContext* GetBrowserContextByIndex( 84 content::BrowserContext* GetBrowserContextByIndex(
85 MultiProfileIndex index) override { 85 MultiProfileIndex index) override {
86 return Shell::GetInstance()->delegate()->GetActiveBrowserContext(); 86 return Shell::GetInstance()->delegate()->GetActiveBrowserContext();
87 } 87 }
88 content::BrowserContext* GetBrowserContextForWindow( 88 content::BrowserContext* GetBrowserContextForWindow(
89 aura::Window* window) override { 89 aura::Window* window) override {
90 return Shell::GetInstance()->delegate()->GetActiveBrowserContext(); 90 return Shell::GetInstance()->delegate()->GetActiveBrowserContext();
91 } 91 }
92 content::BrowserContext* GetUserPresentingBrowserContextForWindow(
93 aura::Window* window) override {
94 return NULL;
95 }
92 int GetMaximumNumberOfLoggedInUsers() const override { return 3; } 96 int GetMaximumNumberOfLoggedInUsers() const override { return 3; }
93 int NumberOfLoggedInUsers() const override { 97 int NumberOfLoggedInUsers() const override {
94 // ash_shell has 2 users. 98 // ash_shell has 2 users.
95 return 2; 99 return 2;
96 } 100 }
97 bool IsActiveUserSessionStarted() const override { return true; } 101 bool IsActiveUserSessionStarted() const override { return true; }
98 bool CanLockScreen() const override { return true; } 102 bool CanLockScreen() const override { return true; }
99 bool IsScreenLocked() const override { return screen_locked_; } 103 bool IsScreenLocked() const override { return screen_locked_; }
100 bool ShouldLockScreenBeforeSuspending() const override { return false; } 104 bool ShouldLockScreenBeforeSuspending() const override { return false; }
101 void LockScreen() override { 105 void LockScreen() override {
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
261 // Real GPU support depends on src/content, so just use a stub. 265 // Real GPU support depends on src/content, so just use a stub.
262 return new GPUSupportStub; 266 return new GPUSupportStub;
263 } 267 }
264 268
265 base::string16 ShellDelegateImpl::GetProductName() const { 269 base::string16 ShellDelegateImpl::GetProductName() const {
266 return base::string16(); 270 return base::string16();
267 } 271 }
268 272
269 } // namespace shell 273 } // namespace shell
270 } // namespace ash 274 } // namespace ash
OLDNEW
« no previous file with comments | « ash/session/session_state_delegate.h ('k') | ash/test/test_session_state_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698