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

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

Issue 11962021: Revert 177182 - ViewTest.ChangeNativeViewHierarchyFindRoots failure (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 11 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 | Annotate | Revision Log
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/test_shell_delegate.h" 5 #include "ash/test/test_shell_delegate.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "ash/caps_lock_delegate_stub.h" 9 #include "ash/caps_lock_delegate_stub.h"
10 #include "ash/host/root_window_host_factory.h" 10 #include "ash/host/root_window_host_factory.h"
11 #include "ash/shell.h" 11 #include "ash/shell.h"
12 #include "ash/shell_window_ids.h" 12 #include "ash/shell_window_ids.h"
13 #include "ash/test/test_launcher_delegate.h" 13 #include "ash/test/test_launcher_delegate.h"
14 #include "ash/wm/stacking_controller.h"
14 #include "ash/wm/window_util.h" 15 #include "ash/wm/window_util.h"
15 #include "content/public/test/test_browser_context.h" 16 #include "content/public/test/test_browser_context.h"
16 #include "ui/aura/window.h" 17 #include "ui/aura/window.h"
17 18
18 namespace ash { 19 namespace ash {
19 namespace test { 20 namespace test {
20 21
21 TestShellDelegate::TestShellDelegate() 22 TestShellDelegate::TestShellDelegate()
22 : locked_(false), 23 : locked_(false),
23 session_started_(true), 24 session_started_(true),
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 } 197 }
197 198
198 ui::MenuModel* TestShellDelegate::CreateContextMenu(aura::RootWindow* root) { 199 ui::MenuModel* TestShellDelegate::CreateContextMenu(aura::RootWindow* root) {
199 return NULL; 200 return NULL;
200 } 201 }
201 202
202 double TestShellDelegate::GetSavedScreenMagnifierScale() { 203 double TestShellDelegate::GetSavedScreenMagnifierScale() {
203 return std::numeric_limits<double>::min(); 204 return std::numeric_limits<double>::min();
204 } 205 }
205 206
207 aura::client::StackingClient* TestShellDelegate::CreateStackingClient() {
208 return new StackingController;
209 }
210
206 RootWindowHostFactory* TestShellDelegate::CreateRootWindowHostFactory() { 211 RootWindowHostFactory* TestShellDelegate::CreateRootWindowHostFactory() {
207 return RootWindowHostFactory::Create(); 212 return RootWindowHostFactory::Create();
208 } 213 }
209 214
210 void TestShellDelegate::SetSessionStarted(bool session_started) { 215 void TestShellDelegate::SetSessionStarted(bool session_started) {
211 session_started_ = session_started; 216 session_started_ = session_started;
212 if (session_started) 217 if (session_started)
213 user_logged_in_ = true; 218 user_logged_in_ = true;
214 } 219 }
215 220
216 void TestShellDelegate::SetUserLoggedIn(bool user_logged_in) { 221 void TestShellDelegate::SetUserLoggedIn(bool user_logged_in) {
217 user_logged_in_ = user_logged_in; 222 user_logged_in_ = user_logged_in;
218 if (!user_logged_in) 223 if (!user_logged_in)
219 session_started_ = false; 224 session_started_ = false;
220 } 225 }
221 226
222 void TestShellDelegate::SetCanLockScreen(bool can_lock_screen) { 227 void TestShellDelegate::SetCanLockScreen(bool can_lock_screen) {
223 can_lock_screen_ = can_lock_screen; 228 can_lock_screen_ = can_lock_screen;
224 } 229 }
225 230
226 } // namespace test 231 } // namespace test
227 } // namespace ash 232 } // namespace ash
OLDNEW
« no previous file with comments | « ash/test/test_shell_delegate.h ('k') | chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698