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

Side by Side Diff: ash/touch/touch_observer_hud_unittest.cc

Issue 24020002: Move GetRootWindowController() to root_window_controller.h (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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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/touch/touch_observer_hud.h" 5 #include "ash/touch/touch_observer_hud.h"
6 6
7 #include "ash/ash_switches.h" 7 #include "ash/ash_switches.h"
8 #include "ash/display/display_manager.h" 8 #include "ash/display/display_manager.h"
9 #include "ash/root_window_controller.h" 9 #include "ash/root_window_controller.h"
10 #include "ash/screen_ash.h" 10 #include "ash/screen_ash.h"
11 #include "ash/shell.h" 11 #include "ash/shell.h"
12 #include "ash/test/ash_test_base.h" 12 #include "ash/test/ash_test_base.h"
13 #include "ash/test/display_manager_test_api.h" 13 #include "ash/test/display_manager_test_api.h"
14 #include "ash/touch/touch_hud_debug.h" 14 #include "ash/touch/touch_hud_debug.h"
15 #include "ash/wm/property_util.h"
16 #include "base/command_line.h" 15 #include "base/command_line.h"
17 #include "base/format_macros.h" 16 #include "base/format_macros.h"
18 #include "base/strings/stringprintf.h" 17 #include "base/strings/stringprintf.h"
19 #include "ui/aura/window.h" 18 #include "ui/aura/window.h"
20 19
21 namespace ash { 20 namespace ash {
22 namespace internal { 21 namespace internal {
23 22
24 class TouchHudTest : public test::AshTestBase { 23 class TouchHudTest : public test::AshTestBase {
25 public: 24 public:
(...skipping 385 matching lines...) Expand 10 before | Expand all | Expand 10 after
411 // Add the internal display back. 410 // Add the internal display back.
412 AddInternalDisplay(); 411 AddInternalDisplay();
413 412
414 // Check if the display's touch HUD is set correctly. 413 // Check if the display's touch HUD is set correctly.
415 EXPECT_EQ(internal_display_id(), GetPrimaryDisplay().id()); 414 EXPECT_EQ(internal_display_id(), GetPrimaryDisplay().id());
416 CheckInternalDisplay(); 415 CheckInternalDisplay();
417 } 416 }
418 417
419 } // namespace internal 418 } // namespace internal
420 } // namespace ash 419 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698