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

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

Issue 280863002: Reduce creation of ViewsDelegate (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add widget includes for undef CreateWindow Created 6 years, 7 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_util.h" 10 #include "ash/screen_util.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/touch/touch_hud_projection.h" 15 #include "ash/touch/touch_hud_projection.h"
16 #include "base/command_line.h" 16 #include "base/command_line.h"
17 #include "base/format_macros.h" 17 #include "base/format_macros.h"
18 #include "base/strings/stringprintf.h" 18 #include "base/strings/stringprintf.h"
19 #include "ui/aura/window.h" 19 #include "ui/aura/window.h"
20 #include "ui/views/widget/widget.h"
20 21
21 namespace ash { 22 namespace ash {
22 23
23 class TouchHudTestBase : public test::AshTestBase { 24 class TouchHudTestBase : public test::AshTestBase {
24 public: 25 public:
25 TouchHudTestBase() {} 26 TouchHudTestBase() {}
26 virtual ~TouchHudTestBase() {} 27 virtual ~TouchHudTestBase() {}
27 28
28 virtual void SetUp() OVERRIDE { 29 virtual void SetUp() OVERRIDE {
29 test::AshTestBase::SetUp(); 30 test::AshTestBase::SetUp();
(...skipping 554 matching lines...) Expand 10 before | Expand all | Expand 10 after
584 585
585 SendTouchEventToInternalHud(ui::ET_TOUCH_PRESSED, gfx::Point(10, 10), 1); 586 SendTouchEventToInternalHud(ui::ET_TOUCH_PRESSED, gfx::Point(10, 10), 1);
586 EXPECT_EQ(1, GetInternalTouchPointsCount()); 587 EXPECT_EQ(1, GetInternalTouchPointsCount());
587 588
588 // Disabling projection touch HUD shoud remove it without crashing. 589 // Disabling projection touch HUD shoud remove it without crashing.
589 DisableTouchHudProjection(); 590 DisableTouchHudProjection();
590 EXPECT_EQ(NULL, GetInternalTouchHudProjection()); 591 EXPECT_EQ(NULL, GetInternalTouchHudProjection());
591 } 592 }
592 593
593 } // namespace ash 594 } // namespace ash
OLDNEW
« no previous file with comments | « ash/test/ash_test_views_delegate.cc ('k') | ash/wm/gestures/overview_gesture_handler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698