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

Side by Side Diff: ash/wm/screen_dimmer_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/wm/screen_dimmer.h ('k') | ash/wm/session_state_animator_impl.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/wm/screen_dimmer.h" 5 #include "ash/wm/screen_dimmer.h"
6 6
7 #include "ash/root_window_controller.h" 7 #include "ash/root_window_controller.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "ash/test/ash_test_base.h" 9 #include "ash/test/ash_test_base.h"
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "ui/aura/window_event_dispatcher.h" 12 #include "ui/aura/window_event_dispatcher.h"
13 #include "ui/compositor/layer.h" 13 #include "ui/compositor/layer.h"
14 14
15 namespace ash { 15 namespace ash {
16 namespace test { 16 namespace test {
17 17
18 class ScreenDimmerTest : public AshTestBase { 18 class ScreenDimmerTest : public AshTestBase {
19 public: 19 public:
20 ScreenDimmerTest() : dimmer_(NULL) {} 20 ScreenDimmerTest() : dimmer_(NULL) {}
21 virtual ~ScreenDimmerTest() {} 21 virtual ~ScreenDimmerTest() {}
22 22
23 virtual void SetUp() OVERRIDE { 23 virtual void SetUp() override {
24 AshTestBase::SetUp(); 24 AshTestBase::SetUp();
25 dimmer_ = Shell::GetPrimaryRootWindowController()->screen_dimmer(); 25 dimmer_ = Shell::GetPrimaryRootWindowController()->screen_dimmer();
26 test_api_.reset(new ScreenDimmer::TestApi(dimmer_)); 26 test_api_.reset(new ScreenDimmer::TestApi(dimmer_));
27 } 27 }
28 28
29 protected: 29 protected:
30 ScreenDimmer* dimmer_; // not owned 30 ScreenDimmer* dimmer_; // not owned
31 31
32 scoped_ptr<ScreenDimmer::TestApi> test_api_; 32 scoped_ptr<ScreenDimmer::TestApi> test_api_;
33 33
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 70
71 // When we resize the root window, the dimming layer should be resized to 71 // When we resize the root window, the dimming layer should be resized to
72 // match. 72 // match.
73 gfx::Rect kNewBounds(400, 300); 73 gfx::Rect kNewBounds(400, 300);
74 Shell::GetPrimaryRootWindow()->GetHost()->SetBounds(kNewBounds); 74 Shell::GetPrimaryRootWindow()->GetHost()->SetBounds(kNewBounds);
75 EXPECT_EQ(kNewBounds.ToString(), dimming_layer->bounds().ToString()); 75 EXPECT_EQ(kNewBounds.ToString(), dimming_layer->bounds().ToString());
76 } 76 }
77 77
78 } // namespace test 78 } // namespace test
79 } // namespace ash 79 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/screen_dimmer.h ('k') | ash/wm/session_state_animator_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698