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

Side by Side Diff: ash/shell.h

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: 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 | « no previous file | ash/shell.cc » ('j') | ash/system/bluetooth/tray_bluetooth.cc » ('J')
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 #ifndef ASH_SHELL_H_ 5 #ifndef ASH_SHELL_H_
6 #define ASH_SHELL_H_ 6 #define ASH_SHELL_H_
7 7
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 382 matching lines...) Expand 10 before | Expand all | Expand 10 after
393 ShellDelegate* delegate() { return delegate_.get(); } 393 ShellDelegate* delegate() { return delegate_.get(); }
394 394
395 UserWallpaperDelegate* user_wallpaper_delegate() { 395 UserWallpaperDelegate* user_wallpaper_delegate() {
396 return user_wallpaper_delegate_.get(); 396 return user_wallpaper_delegate_.get();
397 } 397 }
398 398
399 SessionStateDelegate* session_state_delegate() { 399 SessionStateDelegate* session_state_delegate() {
400 return session_state_delegate_.get(); 400 return session_state_delegate_.get();
401 } 401 }
402 402
403 // For testing only: set specific SessionStateDelegate
404 void SetSessionStateDelegateForTesting(
405 SessionStateDelegate* session_state_delegate);
406
403 AccessibilityDelegate* accessibility_delegate() { 407 AccessibilityDelegate* accessibility_delegate() {
404 return accessibility_delegate_.get(); 408 return accessibility_delegate_.get();
405 } 409 }
406 410
407 NewWindowDelegate* new_window_delegate() { 411 NewWindowDelegate* new_window_delegate() {
408 return new_window_delegate_.get(); 412 return new_window_delegate_.get();
409 } 413 }
410 414
411 MediaDelegate* media_delegate() { 415 MediaDelegate* media_delegate() {
412 return media_delegate_.get(); 416 return media_delegate_.get();
(...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after
751 755
752 // Injected content::GPUDataManager support. 756 // Injected content::GPUDataManager support.
753 scoped_ptr<GPUSupport> gpu_support_; 757 scoped_ptr<GPUSupport> gpu_support_;
754 758
755 DISALLOW_COPY_AND_ASSIGN(Shell); 759 DISALLOW_COPY_AND_ASSIGN(Shell);
756 }; 760 };
757 761
758 } // namespace ash 762 } // namespace ash
759 763
760 #endif // ASH_SHELL_H_ 764 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « no previous file | ash/shell.cc » ('j') | ash/system/bluetooth/tray_bluetooth.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698