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

Side by Side Diff: ash/test/shell_test_api.cc

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: Fixed comments 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
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/test/shell_test_api.h" 5 #include "ash/test/shell_test_api.h"
6 6
7 #include "ash/root_window_controller.h" 7 #include "ash/root_window_controller.h"
8 #include "ash/session/session_state_delegate.h"
8 #include "ash/shelf/shelf_delegate.h" 9 #include "ash/shelf/shelf_delegate.h"
9 #include "ash/shell.h" 10 #include "ash/shell.h"
10 11
11 #if defined(OS_CHROMEOS) 12 #if defined(OS_CHROMEOS)
12 #include "ash/display/display_configurator_animation.h" 13 #include "ash/display/display_configurator_animation.h"
13 #include "ui/display/chromeos/display_configurator.h" 14 #include "ui/display/chromeos/display_configurator.h"
14 #endif 15 #endif
15 16
16 namespace ash { 17 namespace ash {
17 namespace test { 18 namespace test {
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 shell_->display_configurator_animation_.get()); 63 shell_->display_configurator_animation_.get());
63 shell_->display_configurator_animation_.reset(); 64 shell_->display_configurator_animation_.reset();
64 } 65 }
65 #endif // defined(OS_CHROMEOS) 66 #endif // defined(OS_CHROMEOS)
66 } 67 }
67 68
68 void ShellTestApi::SetShelfDelegate(ShelfDelegate* delegate) { 69 void ShellTestApi::SetShelfDelegate(ShelfDelegate* delegate) {
69 shell_->shelf_delegate_.reset(delegate); 70 shell_->shelf_delegate_.reset(delegate);
70 } 71 }
71 72
73 void ShellTestApi::SetSessionStateDelegate(
74 SessionStateDelegate* session_state_delegate) {
75 shell_->session_state_delegate_.reset(session_state_delegate);
76 }
77
72 } // namespace test 78 } // namespace test
73 } // namespace ash 79 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698