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

Side by Side Diff: chrome/test/base/view_event_test_platform_part_chromeos.cc

Issue 637933002: Replace FINAL and OVERRIDE with their C++11 counterparts in chrome/test (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 "chrome/test/base/view_event_test_platform_part.h" 5 #include "chrome/test/base/view_event_test_platform_part.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/shell_init_params.h" 8 #include "ash/shell_init_params.h"
9 #include "ash/test/test_session_state_delegate.h" 9 #include "ash/test/test_session_state_delegate.h"
10 #include "ash/test/test_shell_delegate.h" 10 #include "ash/test/test_shell_delegate.h"
11 #include "chromeos/audio/cras_audio_handler.h" 11 #include "chromeos/audio/cras_audio_handler.h"
12 #include "chromeos/dbus/dbus_thread_manager.h" 12 #include "chromeos/dbus/dbus_thread_manager.h"
13 #include "chromeos/network/network_handler.h" 13 #include "chromeos/network/network_handler.h"
14 #include "ui/aura/env.h" 14 #include "ui/aura/env.h"
15 #include "ui/aura/window_tree_host.h" 15 #include "ui/aura/window_tree_host.h"
16 #include "ui/message_center/message_center.h" 16 #include "ui/message_center/message_center.h"
17 #include "ui/wm/core/wm_state.h" 17 #include "ui/wm/core/wm_state.h"
18 18
19 namespace { 19 namespace {
20 20
21 // ViewEventTestPlatformPart implementation for ChromeOS (chromeos=1). 21 // ViewEventTestPlatformPart implementation for ChromeOS (chromeos=1).
22 class ViewEventTestPlatformPartChromeOS : public ViewEventTestPlatformPart { 22 class ViewEventTestPlatformPartChromeOS : public ViewEventTestPlatformPart {
23 public: 23 public:
24 explicit ViewEventTestPlatformPartChromeOS( 24 explicit ViewEventTestPlatformPartChromeOS(
25 ui::ContextFactory* context_factory); 25 ui::ContextFactory* context_factory);
26 virtual ~ViewEventTestPlatformPartChromeOS(); 26 virtual ~ViewEventTestPlatformPartChromeOS();
27 27
28 // Overridden from ViewEventTestPlatformPart: 28 // Overridden from ViewEventTestPlatformPart:
29 virtual gfx::NativeWindow GetContext() OVERRIDE { 29 virtual gfx::NativeWindow GetContext() override {
30 return ash::Shell::GetPrimaryRootWindow(); 30 return ash::Shell::GetPrimaryRootWindow();
31 } 31 }
32 32
33 private: 33 private:
34 wm::WMState wm_state_; 34 wm::WMState wm_state_;
35 35
36 DISALLOW_COPY_AND_ASSIGN(ViewEventTestPlatformPartChromeOS); 36 DISALLOW_COPY_AND_ASSIGN(ViewEventTestPlatformPartChromeOS);
37 }; 37 };
38 38
39 ViewEventTestPlatformPartChromeOS::ViewEventTestPlatformPartChromeOS( 39 ViewEventTestPlatformPartChromeOS::ViewEventTestPlatformPartChromeOS(
(...skipping 27 matching lines...) Expand all
67 aura::Env::DeleteInstance(); 67 aura::Env::DeleteInstance();
68 } 68 }
69 69
70 } // namespace 70 } // namespace
71 71
72 // static 72 // static
73 ViewEventTestPlatformPart* ViewEventTestPlatformPart::Create( 73 ViewEventTestPlatformPart* ViewEventTestPlatformPart::Create(
74 ui::ContextFactory* context_factory) { 74 ui::ContextFactory* context_factory) {
75 return new ViewEventTestPlatformPartChromeOS(context_factory); 75 return new ViewEventTestPlatformPartChromeOS(context_factory);
76 } 76 }
OLDNEW
« no previous file with comments | « chrome/test/base/view_event_test_platform_part_ash.cc ('k') | chrome/test/base/view_event_test_platform_part_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698