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

Side by Side Diff: extensions/shell/browser/shell_desktop_controller_unittest.cc

Issue 622343002: replace OVERRIDE and FINAL with override and final in extensions/ (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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "extensions/shell/browser/shell_desktop_controller.h" 5 #include "extensions/shell/browser/shell_desktop_controller.h"
6 6
7 #include "base/macros.h" 7 #include "base/macros.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/time/time.h" 9 #include "base/time/time.h"
10 #include "ui/aura/test/aura_test_base.h" 10 #include "ui/aura/test/aura_test_base.h"
11 11
12 #if defined(OS_CHROMEOS) 12 #if defined(OS_CHROMEOS)
13 #include "chromeos/dbus/dbus_thread_manager.h" 13 #include "chromeos/dbus/dbus_thread_manager.h"
14 #include "chromeos/dbus/fake_power_manager_client.h" 14 #include "chromeos/dbus/fake_power_manager_client.h"
15 #endif 15 #endif
16 16
17 namespace extensions { 17 namespace extensions {
18 18
19 class ShellDesktopControllerTest : public aura::test::AuraTestBase { 19 class ShellDesktopControllerTest : public aura::test::AuraTestBase {
20 public: 20 public:
21 ShellDesktopControllerTest() 21 ShellDesktopControllerTest()
22 #if defined(OS_CHROMEOS) 22 #if defined(OS_CHROMEOS)
23 : power_manager_client_(NULL) 23 : power_manager_client_(NULL)
24 #endif 24 #endif
25 { 25 {
26 } 26 }
27 virtual ~ShellDesktopControllerTest() {} 27 virtual ~ShellDesktopControllerTest() {}
28 28
29 virtual void SetUp() OVERRIDE { 29 virtual void SetUp() override {
30 #if defined(OS_CHROMEOS) 30 #if defined(OS_CHROMEOS)
31 scoped_ptr<chromeos::DBusThreadManagerSetter> dbus_setter = 31 scoped_ptr<chromeos::DBusThreadManagerSetter> dbus_setter =
32 chromeos::DBusThreadManager::GetSetterForTesting(); 32 chromeos::DBusThreadManager::GetSetterForTesting();
33 power_manager_client_ = new chromeos::FakePowerManagerClient(); 33 power_manager_client_ = new chromeos::FakePowerManagerClient();
34 dbus_setter->SetPowerManagerClient(make_scoped_ptr(power_manager_client_). 34 dbus_setter->SetPowerManagerClient(make_scoped_ptr(power_manager_client_).
35 PassAs<chromeos::PowerManagerClient>()); 35 PassAs<chromeos::PowerManagerClient>());
36 #endif 36 #endif
37 aura::test::AuraTestBase::SetUp(); 37 aura::test::AuraTestBase::SetUp();
38 controller_.reset(new ShellDesktopController()); 38 controller_.reset(new ShellDesktopController());
39 } 39 }
40 40
41 virtual void TearDown() OVERRIDE { 41 virtual void TearDown() override {
42 controller_.reset(); 42 controller_.reset();
43 aura::test::AuraTestBase::TearDown(); 43 aura::test::AuraTestBase::TearDown();
44 #if defined(OS_CHROMEOS) 44 #if defined(OS_CHROMEOS)
45 chromeos::DBusThreadManager::Shutdown(); 45 chromeos::DBusThreadManager::Shutdown();
46 #endif 46 #endif
47 } 47 }
48 48
49 protected: 49 protected:
50 scoped_ptr<ShellDesktopController> controller_; 50 scoped_ptr<ShellDesktopController> controller_;
51 51
(...skipping 15 matching lines...) Expand all
67 EXPECT_EQ(0, power_manager_client_->num_request_shutdown_calls()); 67 EXPECT_EQ(0, power_manager_client_->num_request_shutdown_calls());
68 68
69 // A button press should trigger a shutdown request. 69 // A button press should trigger a shutdown request.
70 power_manager_client_->SendPowerButtonEvent(true /* down */, 70 power_manager_client_->SendPowerButtonEvent(true /* down */,
71 base::TimeTicks()); 71 base::TimeTicks());
72 EXPECT_EQ(1, power_manager_client_->num_request_shutdown_calls()); 72 EXPECT_EQ(1, power_manager_client_->num_request_shutdown_calls());
73 } 73 }
74 #endif 74 #endif
75 75
76 } // namespace extensions 76 } // namespace extensions
OLDNEW
« no previous file with comments | « extensions/shell/browser/shell_desktop_controller.cc ('k') | extensions/shell/browser/shell_device_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698