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

Side by Side Diff: ash/shelf/shelf_widget_unittest.cc

Issue 194843004: Move files from ui/views/corewm to ui/wm/core (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 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 | 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/shelf/shelf_widget.h" 5 #include "ash/shelf/shelf_widget.h"
6 6
7 #include "ash/root_window_controller.h" 7 #include "ash/root_window_controller.h"
8 #include "ash/shelf/shelf.h" 8 #include "ash/shelf/shelf.h"
9 #include "ash/shelf/shelf_button.h" 9 #include "ash/shelf/shelf_button.h"
10 #include "ash/shelf/shelf_layout_manager.h" 10 #include "ash/shelf/shelf_layout_manager.h"
11 #include "ash/shelf/shelf_model.h" 11 #include "ash/shelf/shelf_model.h"
12 #include "ash/shelf/shelf_view.h" 12 #include "ash/shelf/shelf_view.h"
13 #include "ash/shell.h" 13 #include "ash/shell.h"
14 #include "ash/test/ash_test_base.h" 14 #include "ash/test/ash_test_base.h"
15 #include "ash/test/shelf_test_api.h" 15 #include "ash/test/shelf_test_api.h"
16 #include "ash/test/shelf_view_test_api.h" 16 #include "ash/test/shelf_view_test_api.h"
17 #include "ash/wm/window_util.h" 17 #include "ash/wm/window_util.h"
18 #include "ui/aura/window_event_dispatcher.h" 18 #include "ui/aura/window_event_dispatcher.h"
19 #include "ui/events/event_utils.h" 19 #include "ui/events/event_utils.h"
20 #include "ui/gfx/display.h" 20 #include "ui/gfx/display.h"
21 #include "ui/gfx/screen.h" 21 #include "ui/gfx/screen.h"
22 #include "ui/views/corewm/corewm_switches.h"
23 #include "ui/views/view.h" 22 #include "ui/views/view.h"
24 #include "ui/views/widget/widget.h" 23 #include "ui/views/widget/widget.h"
25 24
26 namespace ash { 25 namespace ash {
27 26
28 namespace { 27 namespace {
29 28
30 ShelfWidget* GetShelfWidget() { 29 ShelfWidget* GetShelfWidget() {
31 return Shelf::ForPrimaryDisplay()->shelf_widget(); 30 return Shelf::ForPrimaryDisplay()->shelf_widget();
32 } 31 }
(...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after
284 { 283 {
285 gfx::Point event_location(20, shelf_bounds.y() - 1); 284 gfx::Point event_location(20, shelf_bounds.y() - 1);
286 ui::TouchEvent touch(ui::ET_TOUCH_PRESSED, event_location, 0, 285 ui::TouchEvent touch(ui::ET_TOUCH_PRESSED, event_location, 0,
287 ui::EventTimeForNow()); 286 ui::EventTimeForNow());
288 EXPECT_EQ(shelf_widget->GetNativeWindow(), 287 EXPECT_EQ(shelf_widget->GetNativeWindow(),
289 targeter->FindTargetForEvent(root, &touch)); 288 targeter->FindTargetForEvent(root, &touch));
290 } 289 }
291 } 290 }
292 291
293 } // namespace ash 292 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698