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

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

Issue 23483041: [Cleanup] Remove mac code from aura/ash/views (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 | Annotate | Revision Log
« no previous file with comments | « ash/system/brightness/tray_brightness.cc ('k') | ash/test/test_suite.cc » ('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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/ash_test_helper.h" 5 #include "ash/test/ash_test_helper.h"
6 6
7 #include "ash/ash_switches.h" 7 #include "ash/ash_switches.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "ash/system/tray/test_system_tray_delegate.h" 9 #include "ash/system/tray/test_system_tray_delegate.h"
10 #include "ash/test/display_manager_test_api.h" 10 #include "ash/test/display_manager_test_api.h"
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 // Need to reset the initial login status. 102 // Need to reset the initial login status.
103 TestSystemTrayDelegate::SetInitialLoginStatus(user::LOGGED_IN_USER); 103 TestSystemTrayDelegate::SetInitialLoginStatus(user::LOGGED_IN_USER);
104 104
105 ui::ShutdownInputMethodForTesting(); 105 ui::ShutdownInputMethodForTesting();
106 zero_duration_mode_.reset(); 106 zero_duration_mode_.reset();
107 107
108 CHECK(!views::corewm::ScopedCaptureClient::IsActive()); 108 CHECK(!views::corewm::ScopedCaptureClient::IsActive());
109 } 109 }
110 110
111 void AshTestHelper::RunAllPendingInMessageLoop() { 111 void AshTestHelper::RunAllPendingInMessageLoop() {
112 #if !defined(OS_MACOSX)
113 DCHECK(base::MessageLoopForUI::current() == message_loop_); 112 DCHECK(base::MessageLoopForUI::current() == message_loop_);
114 base::RunLoop run_loop(aura::Env::GetInstance()->GetDispatcher()); 113 base::RunLoop run_loop(aura::Env::GetInstance()->GetDispatcher());
115 run_loop.RunUntilIdle(); 114 run_loop.RunUntilIdle();
116 #endif
117 } 115 }
118 116
119 aura::RootWindow* AshTestHelper::CurrentContext() { 117 aura::RootWindow* AshTestHelper::CurrentContext() {
120 aura::RootWindow* root_window = Shell::GetActiveRootWindow(); 118 aura::RootWindow* root_window = Shell::GetActiveRootWindow();
121 if (!root_window) 119 if (!root_window)
122 root_window = Shell::GetPrimaryRootWindow(); 120 root_window = Shell::GetPrimaryRootWindow();
123 DCHECK(root_window); 121 DCHECK(root_window);
124 return root_window; 122 return root_window;
125 } 123 }
126 124
127 } // namespace test 125 } // namespace test
128 } // namespace ash 126 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/brightness/tray_brightness.cc ('k') | ash/test/test_suite.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698