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

Side by Side Diff: ui/ozone/platform/test/test_window_manager.h

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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 | « ui/ozone/platform/test/test_window.h ('k') | ui/ozone/platform/test/test_window_manager.cc » ('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 #ifndef UI_OZONE_PLATFORM_TEST_FILE_SURFACE_FACTORY_H_ 5 #ifndef UI_OZONE_PLATFORM_TEST_FILE_SURFACE_FACTORY_H_
6 #define UI_OZONE_PLATFORM_TEST_FILE_SURFACE_FACTORY_H_ 6 #define UI_OZONE_PLATFORM_TEST_FILE_SURFACE_FACTORY_H_
7 7
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/id_map.h" 9 #include "base/id_map.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 15 matching lines...) Expand all
26 int32_t AddWindow(TestWindow* window); 26 int32_t AddWindow(TestWindow* window);
27 27
28 // Remove a window. 28 // Remove a window.
29 void RemoveWindow(int32_t window_id, TestWindow* window); 29 void RemoveWindow(int32_t window_id, TestWindow* window);
30 30
31 // User-supplied path for images. 31 // User-supplied path for images.
32 base::FilePath base_path() const; 32 base::FilePath base_path() const;
33 33
34 // SurfaceFactoryOzone: 34 // SurfaceFactoryOzone:
35 virtual scoped_ptr<SurfaceOzoneCanvas> CreateCanvasForWidget( 35 virtual scoped_ptr<SurfaceOzoneCanvas> CreateCanvasForWidget(
36 gfx::AcceleratedWidget w) OVERRIDE; 36 gfx::AcceleratedWidget w) override;
37 virtual bool LoadEGLGLES2Bindings( 37 virtual bool LoadEGLGLES2Bindings(
38 AddGLLibraryCallback add_gl_library, 38 AddGLLibraryCallback add_gl_library,
39 SetGLGetProcAddressProcCallback set_gl_get_proc_address) OVERRIDE; 39 SetGLGetProcAddressProcCallback set_gl_get_proc_address) override;
40 40
41 private: 41 private:
42 base::FilePath location_; 42 base::FilePath location_;
43 43
44 IDMap<TestWindow> windows_; 44 IDMap<TestWindow> windows_;
45 45
46 DISALLOW_COPY_AND_ASSIGN(TestWindowManager); 46 DISALLOW_COPY_AND_ASSIGN(TestWindowManager);
47 }; 47 };
48 48
49 } // namespace ui 49 } // namespace ui
50 50
51 #endif // UI_OZONE_PLATFORM_TEST_FILE_SURFACE_FACTORY_H_ 51 #endif // UI_OZONE_PLATFORM_TEST_FILE_SURFACE_FACTORY_H_
OLDNEW
« no previous file with comments | « ui/ozone/platform/test/test_window.h ('k') | ui/ozone/platform/test/test_window_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698