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

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

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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/drag_drop/drag_image_view.h » ('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 "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/shell_window_ids.h" 8 #include "ash/shell_window_ids.h"
9 #include "ash/test/ash_test_base.h" 9 #include "ash/test/ash_test_base.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 #include "ui/aura/test/test_windows.h" 11 #include "ui/aura/test/test_windows.h"
12 #include "ui/aura/window.h" 12 #include "ui/aura/window.h"
13 #include "ui/aura/window_event_dispatcher.h" 13 #include "ui/aura/window_event_dispatcher.h"
14 14
15 namespace ash { 15 namespace ash {
16 namespace test { 16 namespace test {
17 17
18 class DragDropTrackerTest : public test::AshTestBase { 18 class DragDropTrackerTest : public test::AshTestBase {
19 public: 19 public:
20 virtual void SetUp() OVERRIDE { 20 virtual void SetUp() override {
21 AshTestBase::SetUp(); 21 AshTestBase::SetUp();
22 } 22 }
23 23
24 aura::Window* CreateTestWindow(const gfx::Rect& bounds) { 24 aura::Window* CreateTestWindow(const gfx::Rect& bounds) {
25 static int window_id = 0; 25 static int window_id = 0;
26 return CreateTestWindowInShellWithDelegate( 26 return CreateTestWindowInShellWithDelegate(
27 aura::test::TestWindowDelegate::CreateSelfDestroyingDelegate(), 27 aura::test::TestWindowDelegate::CreateSelfDestroyingDelegate(),
28 window_id++, 28 window_id++,
29 bounds); 29 bounds);
30 } 30 }
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 scoped_ptr<ui::LocatedEvent> converted11(ConvertEvent(window1.get(), 187 scoped_ptr<ui::LocatedEvent> converted11(ConvertEvent(window1.get(),
188 original11)); 188 original11));
189 EXPECT_EQ(original11.type(), converted11->type()); 189 EXPECT_EQ(original11.type(), converted11->type());
190 EXPECT_EQ("50,50", converted11->location().ToString()); 190 EXPECT_EQ("50,50", converted11->location().ToString());
191 EXPECT_EQ("150,150", converted11->root_location().ToString()); 191 EXPECT_EQ("150,150", converted11->root_location().ToString());
192 EXPECT_EQ(original11.flags(), converted11->flags()); 192 EXPECT_EQ(original11.flags(), converted11->flags());
193 } 193 }
194 194
195 } // namespace test 195 } // namespace test
196 } // namespace aura 196 } // namespace aura
OLDNEW
« no previous file with comments | « ash/drag_drop/drag_drop_tracker.cc ('k') | ash/drag_drop/drag_image_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698