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

Side by Side Diff: ash/test/test_metro_viewer_process_host.h

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/test/test_lock_state_controller_delegate.h ('k') | ash/test/test_overlay_delegate.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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 #ifndef ASH_TEST_TEST_METRO_VIEWER_PROCESS_HOST_H_ 5 #ifndef ASH_TEST_TEST_METRO_VIEWER_PROCESS_HOST_H_
6 #define ASH_TEST_TEST_METRO_VIEWER_PROCESS_HOST_H_ 6 #define ASH_TEST_TEST_METRO_VIEWER_PROCESS_HOST_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "win8/viewer/metro_viewer_process_host.h" 9 #include "win8/viewer/metro_viewer_process_host.h"
10 10
11 class AcceleratedSurface; 11 class AcceleratedSurface;
12 12
13 namespace ash { 13 namespace ash {
14 namespace test { 14 namespace test {
15 15
16 class TestMetroViewerProcessHost : public win8::MetroViewerProcessHost { 16 class TestMetroViewerProcessHost : public win8::MetroViewerProcessHost {
17 public: 17 public:
18 TestMetroViewerProcessHost(base::SingleThreadTaskRunner* ipc_task_runner); 18 TestMetroViewerProcessHost(base::SingleThreadTaskRunner* ipc_task_runner);
19 virtual ~TestMetroViewerProcessHost(); 19 virtual ~TestMetroViewerProcessHost();
20 20
21 bool closed_unexpectedly() { return closed_unexpectedly_; } 21 bool closed_unexpectedly() { return closed_unexpectedly_; }
22 22
23 // Forcibly terminate the viewer. Used on completion of tests to ensure that 23 // Forcibly terminate the viewer. Used on completion of tests to ensure that
24 // it's gone (quickly) so that we can start the next test immediately. 24 // it's gone (quickly) so that we can start the next test immediately.
25 void TerminateViewer(); 25 void TerminateViewer();
26 26
27 private: 27 private:
28 // win8::MetroViewerProcessHost implementation 28 // win8::MetroViewerProcessHost implementation
29 virtual void OnChannelError() OVERRIDE; 29 virtual void OnChannelError() override;
30 virtual void OnSetTargetSurface(gfx::NativeViewId target_surface, 30 virtual void OnSetTargetSurface(gfx::NativeViewId target_surface,
31 float device_scale) OVERRIDE; 31 float device_scale) override;
32 virtual void OnOpenURL(const base::string16& url) OVERRIDE; 32 virtual void OnOpenURL(const base::string16& url) override;
33 virtual void OnHandleSearchRequest( 33 virtual void OnHandleSearchRequest(
34 const base::string16& search_string) OVERRIDE; 34 const base::string16& search_string) override;
35 virtual void OnWindowSizeChanged(uint32 width, uint32 height) OVERRIDE; 35 virtual void OnWindowSizeChanged(uint32 width, uint32 height) override;
36 36
37 bool closed_unexpectedly_; 37 bool closed_unexpectedly_;
38 38
39 DISALLOW_COPY_AND_ASSIGN(TestMetroViewerProcessHost); 39 DISALLOW_COPY_AND_ASSIGN(TestMetroViewerProcessHost);
40 }; 40 };
41 41
42 42
43 } // namespace test 43 } // namespace test
44 } // namespace ash 44 } // namespace ash
45 45
46 #endif // ASH_TEST_TEST_METRO_VIEWER_PROCESS_HOST_H_ 46 #endif // ASH_TEST_TEST_METRO_VIEWER_PROCESS_HOST_H_
OLDNEW
« no previous file with comments | « ash/test/test_lock_state_controller_delegate.h ('k') | ash/test/test_overlay_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698