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

Side by Side Diff: athena/env/athena_env_unittest.cc

Issue 641683003: C++11 override style change for athena (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: rebase 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 | « athena/env/athena_env_impl.cc ('k') | athena/extensions/athena_app_delegate_base.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 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 "athena/env/public/athena_env.h" 5 #include "athena/env/public/athena_env.h"
6 6
7 #include "athena/test/base/athena_test_base.h" 7 #include "athena/test/base/athena_test_base.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "ui/gfx/display.h" 9 #include "ui/gfx/display.h"
10 #include "ui/gfx/screen.h" 10 #include "ui/gfx/screen.h"
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 env->OnTerminating(); 101 env->OnTerminating();
102 env->RemoveTerminatingCallback(cb_1_2); 102 env->RemoveTerminatingCallback(cb_1_2);
103 env->RemoveTerminatingCallback(cb_2_1); 103 env->RemoveTerminatingCallback(cb_2_1);
104 } 104 }
105 105
106 namespace { 106 namespace {
107 107
108 class AthenaShutdownTest : public test::AthenaTestBase { 108 class AthenaShutdownTest : public test::AthenaTestBase {
109 public: 109 public:
110 AthenaShutdownTest() {} 110 AthenaShutdownTest() {}
111 virtual ~AthenaShutdownTest() {} 111 ~AthenaShutdownTest() override {}
112 112
113 virtual void TearDown() { 113 virtual void TearDown() {
114 test::AthenaTestBase::TearDown(); 114 test::AthenaTestBase::TearDown();
115 ASSERT_NE( 115 ASSERT_NE(
116 gfx::Display::kInvalidDisplayID, 116 gfx::Display::kInvalidDisplayID,
117 gfx::Screen::GetNativeScreen()->GetPrimaryDisplay().id()); 117 gfx::Screen::GetNativeScreen()->GetPrimaryDisplay().id());
118 } 118 }
119 119
120 private: 120 private:
121 DISALLOW_COPY_AND_ASSIGN(AthenaShutdownTest); 121 DISALLOW_COPY_AND_ASSIGN(AthenaShutdownTest);
122 }; 122 };
123 123
124 } // namespace 124 } // namespace
125 125
126 // gfx::Screen should be accessible after shutdown. 126 // gfx::Screen should be accessible after shutdown.
127 TEST_F(AthenaShutdownTest, Shutdown) { 127 TEST_F(AthenaShutdownTest, Shutdown) {
128 } 128 }
129 129
130 } // namespace athena 130 } // namespace athena
OLDNEW
« no previous file with comments | « athena/env/athena_env_impl.cc ('k') | athena/extensions/athena_app_delegate_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698