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

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

Issue 2653593004: chromeos: Remove AshTestBase::SupportsMultipleDisplays (Closed)
Patch Set: Created 3 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
« no previous file with comments | « ash/test/ash_test_helper.h ('k') | ash/test/ash_test_impl_aura.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 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/accelerators/accelerator_controller_delegate_aura.h" 7 #include "ash/accelerators/accelerator_controller_delegate_aura.h"
8 #include "ash/common/material_design/material_design_controller.h" 8 #include "ash/common/material_design/material_design_controller.h"
9 #include "ash/common/test/material_design_controller_test_api.h" 9 #include "ash/common/test/material_design_controller_test_api.h"
10 #include "ash/common/test/test_session_state_delegate.h" 10 #include "ash/common/test/test_session_state_delegate.h"
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 } 199 }
200 200
201 aura::Window* AshTestHelper::CurrentContext() { 201 aura::Window* AshTestHelper::CurrentContext() {
202 aura::Window* root_window = Shell::GetTargetRootWindow(); 202 aura::Window* root_window = Shell::GetTargetRootWindow();
203 if (!root_window) 203 if (!root_window)
204 root_window = Shell::GetPrimaryRootWindow(); 204 root_window = Shell::GetPrimaryRootWindow();
205 DCHECK(root_window); 205 DCHECK(root_window);
206 return root_window; 206 return root_window;
207 } 207 }
208 208
209 // static
210 bool AshTestHelper::SupportsMultipleDisplays() {
211 // TODO(jamescook): Figure out if we want SupportsMultipleDisplays() to return
212 // false on mustash. If not, remove this function and the AshTestBase version
213 // and remove calls from all the tests. For now just leave the ifdef strings
214 // OS_CHROMEOS and OS_WIN in this comment as a reminder to clean up.
215 // http://crbug.com/682990
216 return true;
217 }
218
219 } // namespace test 209 } // namespace test
220 } // namespace ash 210 } // namespace ash
OLDNEW
« no previous file with comments | « ash/test/ash_test_helper.h ('k') | ash/test/ash_test_impl_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698