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

Side by Side Diff: ash/drag_drop/drag_drop_tracker_unittest.cc

Issue 2430593002: mash: Use ash shell window container ids instead of ash::mojom::Container (Closed)
Patch Set: rebase Created 4 years, 2 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
« no previous file with comments | « ash/drag_drop/drag_drop_tracker.cc ('k') | ash/extended_desktop_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/drag_drop/drag_drop_tracker.h" 5 #include "ash/drag_drop/drag_drop_tracker.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "ash/aura/wm_window_aura.h" 9 #include "ash/aura/wm_window_aura.h"
10 #include "ash/common/scoped_root_window_for_new_windows.h" 10 #include "ash/common/scoped_root_window_for_new_windows.h"
11 #include "ash/common/shell_window_ids.h"
12 #include "ash/common/wm_shell.h" 11 #include "ash/common/wm_shell.h"
12 #include "ash/public/cpp/shell_window_ids.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 "ui/aura/test/test_windows.h" 15 #include "ui/aura/test/test_windows.h"
16 #include "ui/aura/window.h" 16 #include "ui/aura/window.h"
17 #include "ui/aura/window_event_dispatcher.h" 17 #include "ui/aura/window_event_dispatcher.h"
18 #include "ui/events/event_utils.h" 18 #include "ui/events/event_utils.h"
19 19
20 namespace ash { 20 namespace ash {
21 namespace test { 21 namespace test {
22 22
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 std::unique_ptr<ui::LocatedEvent> converted11( 182 std::unique_ptr<ui::LocatedEvent> converted11(
183 ConvertEvent(window1.get(), original11)); 183 ConvertEvent(window1.get(), original11));
184 EXPECT_EQ(original11.type(), converted11->type()); 184 EXPECT_EQ(original11.type(), converted11->type());
185 EXPECT_EQ("50,50", converted11->location().ToString()); 185 EXPECT_EQ("50,50", converted11->location().ToString());
186 EXPECT_EQ("150,150", converted11->root_location().ToString()); 186 EXPECT_EQ("150,150", converted11->root_location().ToString());
187 EXPECT_EQ(original11.flags(), converted11->flags()); 187 EXPECT_EQ(original11.flags(), converted11->flags());
188 } 188 }
189 189
190 } // namespace test 190 } // namespace test
191 } // namespace aura 191 } // namespace aura
OLDNEW
« no previous file with comments | « ash/drag_drop/drag_drop_tracker.cc ('k') | ash/extended_desktop_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698