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

Side by Side Diff: athena/screen/screen_manager_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, 1 month 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 <algorithm> 5 #include <algorithm>
6 #include <string> 6 #include <string>
7 7
8 #include "athena/screen/screen_manager_impl.h" 8 #include "athena/screen/screen_manager_impl.h"
9 #include "athena/test/base/athena_test_base.h" 9 #include "athena/test/base/athena_test_base.h"
10 #include "athena/test/base/test_windows.h" 10 #include "athena/test/base/test_windows.h"
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 } 164 }
165 165
166 namespace { 166 namespace {
167 167
168 class ScreenManagerTargeterTest 168 class ScreenManagerTargeterTest
169 : public athena::test::AthenaTestBase, 169 : public athena::test::AthenaTestBase,
170 public testing::WithParamInterface<bool> { 170 public testing::WithParamInterface<bool> {
171 public: 171 public:
172 ScreenManagerTargeterTest() 172 ScreenManagerTargeterTest()
173 : targeter_(GetParam() ? nullptr : new aura::WindowTargeter) {} 173 : targeter_(GetParam() ? nullptr : new aura::WindowTargeter) {}
174 virtual ~ScreenManagerTargeterTest() {} 174 ~ScreenManagerTargeterTest() override {}
175 175
176 protected: 176 protected:
177 scoped_ptr<ui::EventTargeter> targeter_; 177 scoped_ptr<ui::EventTargeter> targeter_;
178 178
179 private: 179 private:
180 DISALLOW_COPY_AND_ASSIGN(ScreenManagerTargeterTest); 180 DISALLOW_COPY_AND_ASSIGN(ScreenManagerTargeterTest);
181 }; 181 };
182 182
183 } // namespace 183 } // namespace
184 184
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
278 event_generator.ClickLeftButton(); 278 event_generator.ClickLeftButton();
279 EXPECT_EQ("0 0", normal_delegate.GetMouseButtonCountsAndReset()); 279 EXPECT_EQ("0 0", normal_delegate.GetMouseButtonCountsAndReset());
280 EXPECT_EQ("0 0", block_delegate.GetMouseButtonCountsAndReset()); 280 EXPECT_EQ("0 0", block_delegate.GetMouseButtonCountsAndReset());
281 } 281 }
282 282
283 INSTANTIATE_TEST_CASE_P(WithOrWithoutTargeter, 283 INSTANTIATE_TEST_CASE_P(WithOrWithoutTargeter,
284 ScreenManagerTargeterTest, 284 ScreenManagerTargeterTest,
285 testing::Values(false, true)); 285 testing::Values(false, true));
286 286
287 } // namespace athena 287 } // namespace athena
OLDNEW
« no previous file with comments | « athena/screen/screen_manager_impl.cc ('k') | athena/screen_lock/chrome/chrome_screen_lock_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698