| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "ui/chromeos/touch_exploration_controller.h" | 5 #include "ui/chromeos/touch_exploration_controller.h" |
| 6 | 6 |
| 7 #include "ash/accessibility_delegate.h" | 7 #include "ash/accessibility_delegate.h" |
| 8 #include "ash/ash_switches.h" |
| 8 #include "ash/shell.h" | 9 #include "ash/shell.h" |
| 9 #include "ash/test/ash_test_base.h" | 10 #include "ash/test/ash_test_base.h" |
| 11 #include "base/command_line.h" |
| 10 #include "base/test/simple_test_tick_clock.h" | 12 #include "base/test/simple_test_tick_clock.h" |
| 11 #include "base/time/time.h" | 13 #include "base/time/time.h" |
| 12 #include "chrome/browser/ui/browser.h" | 14 #include "chrome/browser/ui/browser.h" |
| 13 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 15 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 14 #include "chrome/test/base/in_process_browser_test.h" | 16 #include "chrome/test/base/in_process_browser_test.h" |
| 15 #include "chrome/test/base/ui_test_utils.h" | 17 #include "chrome/test/base/ui_test_utils.h" |
| 16 #include "content/public/test/browser_test_utils.h" | 18 #include "content/public/test/browser_test_utils.h" |
| 17 #include "ui/aura/client/cursor_client.h" | 19 #include "ui/aura/client/cursor_client.h" |
| 18 #include "ui/aura/test/event_generator.h" | 20 #include "ui/aura/test/event_generator.h" |
| 19 #include "ui/aura/window_tree_host.h" | 21 #include "ui/aura/window_tree_host.h" |
| 20 #include "ui/compositor/compositor.h" | 22 #include "ui/compositor/compositor.h" |
| 21 #include "ui/compositor/test/draw_waiter_for_test.h" | 23 #include "ui/compositor/test/draw_waiter_for_test.h" |
| 22 #include "ui/events/event.h" | 24 #include "ui/events/event.h" |
| 23 #include "ui/events/event_utils.h" | 25 #include "ui/events/event_utils.h" |
| 24 #include "ui/events/test/test_event_handler.h" | 26 #include "ui/events/test/test_event_handler.h" |
| 25 | 27 |
| 26 namespace ui { | 28 namespace ui { |
| 27 | 29 |
| 28 class TouchExplorationTest : public InProcessBrowserTest { | 30 class TouchExplorationTest : public InProcessBrowserTest { |
| 29 public: | 31 public: |
| 30 TouchExplorationTest() : simulated_clock_(new base::SimpleTestTickClock()) { | 32 TouchExplorationTest() : simulated_clock_(new base::SimpleTestTickClock()) { |
| 31 // Tests fail if time is ever 0. | 33 // Tests fail if time is ever 0. |
| 32 simulated_clock_->Advance(base::TimeDelta::FromMilliseconds(10)); | 34 simulated_clock_->Advance(base::TimeDelta::FromMilliseconds(10)); |
| 33 } | 35 } |
| 34 virtual ~TouchExplorationTest() {} | 36 virtual ~TouchExplorationTest() {} |
| 35 | 37 |
| 36 protected: | 38 protected: |
| 39 virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE { |
| 40 base::CommandLine::ForCurrentProcess()->AppendSwitch( |
| 41 ash::switches::kAshEnableTouchExplorationMode); |
| 42 } |
| 43 |
| 37 virtual void SetUpOnMainThread() OVERRIDE { | 44 virtual void SetUpOnMainThread() OVERRIDE { |
| 38 // The RenderView for WebContents is created as a result of the | 45 // The RenderView for WebContents is created as a result of the |
| 39 // navigation to the New Tab page which is done as part of the test | 46 // navigation to the New Tab page which is done as part of the test |
| 40 // SetUp. The creation involves sending a resize message to the renderer | 47 // SetUp. The creation involves sending a resize message to the renderer |
| 41 // process. Here we wait for the resize ack to be received, because | 48 // process. Here we wait for the resize ack to be received, because |
| 42 // currently WindowEventDispatcher has code to hold touch and mouse | 49 // currently WindowEventDispatcher has code to hold touch and mouse |
| 43 // move events until resize is complete (crbug.com/384342) which | 50 // move events until resize is complete (crbug.com/384342) which |
| 44 // interferes with this test. | 51 // interferes with this test. |
| 45 content::WebContents* web_contents = | 52 content::WebContents* web_contents = |
| 46 browser()->tab_strip_model()->GetActiveWebContents(); | 53 browser()->tab_strip_model()->GetActiveWebContents(); |
| (...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 180 | 187 |
| 181 // Continuing to move the touch exploration finger should send more mouse | 188 // Continuing to move the touch exploration finger should send more mouse |
| 182 // events. | 189 // events. |
| 183 generator.MoveTouchId(gfx::Point(509, 609), 1); | 190 generator.MoveTouchId(gfx::Point(509, 609), 1); |
| 184 EXPECT_EQ(0, event_handler_->num_touch_events()); | 191 EXPECT_EQ(0, event_handler_->num_touch_events()); |
| 185 EXPECT_TRUE(cursor_client->IsMouseEventsEnabled()); | 192 EXPECT_TRUE(cursor_client->IsMouseEventsEnabled()); |
| 186 EXPECT_FALSE(cursor_client->IsCursorVisible()); | 193 EXPECT_FALSE(cursor_client->IsCursorVisible()); |
| 187 } | 194 } |
| 188 | 195 |
| 189 } // namespace ui | 196 } // namespace ui |
| OLD | NEW |