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

Side by Side Diff: chrome/browser/chromeos/accessibility/touch_exploration_controller_browsertest.cc

Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3" (Closed)
Patch Set: Created 3 years, 9 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
OLDNEW
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/common/accessibility_delegate.h"
8 #include "ash/accessibility_types.h" 8 #include "ash/common/accessibility_types.h"
9 #include "ash/common/wm_shell.h"
9 #include "ash/shell.h" 10 #include "ash/shell.h"
10 #include "ash/test/ash_test_base.h" 11 #include "ash/test/ash_test_base.h"
11 #include "ash/wm_shell.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "base/test/simple_test_tick_clock.h" 13 #include "base/test/simple_test_tick_clock.h"
14 #include "base/time/time.h" 14 #include "base/time/time.h"
15 #include "build/build_config.h" 15 #include "build/build_config.h"
16 #include "chrome/browser/ui/browser.h" 16 #include "chrome/browser/ui/browser.h"
17 #include "chrome/browser/ui/tabs/tab_strip_model.h" 17 #include "chrome/browser/ui/tabs/tab_strip_model.h"
18 #include "chrome/test/base/in_process_browser_test.h" 18 #include "chrome/test/base/in_process_browser_test.h"
19 #include "content/public/test/browser_test_utils.h" 19 #include "content/public/test/browser_test_utils.h"
20 #include "ui/aura/client/cursor_client.h" 20 #include "ui/aura/client/cursor_client.h"
21 #include "ui/aura/window_tree_host.h" 21 #include "ui/aura/window_tree_host.h"
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 EXPECT_EQ(2, event_handler_->num_touch_events()); 240 EXPECT_EQ(2, event_handler_->num_touch_events());
241 event_handler_->Reset(); 241 event_handler_->Reset();
242 242
243 // Continuing to move the touch exploration finger should send more mouse 243 // Continuing to move the touch exploration finger should send more mouse
244 // events. 244 // events.
245 generator.MoveTouchId(gfx::Point(509, 609), 1); 245 generator.MoveTouchId(gfx::Point(509, 609), 1);
246 EXPECT_EQ(0, event_handler_->num_touch_events()); 246 EXPECT_EQ(0, event_handler_->num_touch_events());
247 EXPECT_TRUE(cursor_client->IsMouseEventsEnabled()); 247 EXPECT_TRUE(cursor_client->IsMouseEventsEnabled());
248 EXPECT_FALSE(cursor_client->IsCursorVisible()); 248 EXPECT_FALSE(cursor_client->IsCursorVisible());
249 } 249 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698