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

Side by Side Diff: ui/wm/core/transient_window_stacking_client_unittest.cc

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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 | « ui/wm/core/transient_window_stacking_client.h ('k') | ui/wm/core/user_activity_detector.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) 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 "ui/wm/core/transient_window_stacking_client.h" 5 #include "ui/wm/core/transient_window_stacking_client.h"
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "ui/aura/test/aura_test_base.h" 8 #include "ui/aura/test/aura_test_base.h"
9 #include "ui/aura/test/test_windows.h" 9 #include "ui/aura/test/test_windows.h"
10 #include "ui/compositor/test/test_layers.h" 10 #include "ui/compositor/test/test_layers.h"
11 #include "ui/wm/core/window_util.h" 11 #include "ui/wm/core/window_util.h"
12 12
13 using aura::test::ChildWindowIDsAsString; 13 using aura::test::ChildWindowIDsAsString;
14 using aura::test::CreateTestWindowWithId; 14 using aura::test::CreateTestWindowWithId;
15 using aura::Window; 15 using aura::Window;
16 16
17 namespace wm { 17 namespace wm {
18 18
19 class TransientWindowStackingClientTest : public aura::test::AuraTestBase { 19 class TransientWindowStackingClientTest : public aura::test::AuraTestBase {
20 public: 20 public:
21 TransientWindowStackingClientTest() {} 21 TransientWindowStackingClientTest() {}
22 virtual ~TransientWindowStackingClientTest() {} 22 virtual ~TransientWindowStackingClientTest() {}
23 23
24 virtual void SetUp() OVERRIDE { 24 virtual void SetUp() override {
25 AuraTestBase::SetUp(); 25 AuraTestBase::SetUp();
26 client_.reset(new TransientWindowStackingClient); 26 client_.reset(new TransientWindowStackingClient);
27 aura::client::SetWindowStackingClient(client_.get()); 27 aura::client::SetWindowStackingClient(client_.get());
28 } 28 }
29 29
30 virtual void TearDown() OVERRIDE { 30 virtual void TearDown() override {
31 aura::client::SetWindowStackingClient(NULL); 31 aura::client::SetWindowStackingClient(NULL);
32 AuraTestBase::TearDown(); 32 AuraTestBase::TearDown();
33 } 33 }
34 34
35 private: 35 private:
36 scoped_ptr<TransientWindowStackingClient> client_; 36 scoped_ptr<TransientWindowStackingClient> client_;
37 DISALLOW_COPY_AND_ASSIGN(TransientWindowStackingClientTest); 37 DISALLOW_COPY_AND_ASSIGN(TransientWindowStackingClientTest);
38 }; 38 };
39 39
40 // Tests that transient children are stacked as a unit when using stack above. 40 // Tests that transient children are stacked as a unit when using stack above.
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 // Since neither |window3| nor |window1| have a delegate, |window2| should 206 // Since neither |window3| nor |window1| have a delegate, |window2| should
207 // not move in front of either. 207 // not move in front of either.
208 window3->layer()->set_delegate(NULL); 208 window3->layer()->set_delegate(NULL);
209 root_window()->StackChildBelow(window2.get(), window1.get()); 209 root_window()->StackChildBelow(window2.get(), window1.get());
210 EXPECT_EQ("2 3 1", ChildWindowIDsAsString(root_window())); 210 EXPECT_EQ("2 3 1", ChildWindowIDsAsString(root_window()));
211 EXPECT_EQ("2 3 1", 211 EXPECT_EQ("2 3 1",
212 ui::test::ChildLayerNamesAsString(*root_window()->layer())); 212 ui::test::ChildLayerNamesAsString(*root_window()->layer()));
213 } 213 }
214 214
215 } // namespace wm 215 } // namespace wm
OLDNEW
« no previous file with comments | « ui/wm/core/transient_window_stacking_client.h ('k') | ui/wm/core/user_activity_detector.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698