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

Side by Side Diff: ui/ozone/platform/dri/gbm_surface_factory.cc

Issue 518303002: ozone: gbm: Fix missing OVERRIDE (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 | « no previous file | no next file » | 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 "ui/ozone/platform/dri/gbm_surface_factory.h" 5 #include "ui/ozone/platform/dri/gbm_surface_factory.h"
6 6
7 #include <gbm.h> 7 #include <gbm.h>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 10 matching lines...) Expand all
21 #include "ui/ozone/public/surface_ozone_egl.h" 21 #include "ui/ozone/public/surface_ozone_egl.h"
22 22
23 namespace ui { 23 namespace ui {
24 namespace { 24 namespace {
25 25
26 class SingleOverlay : public OverlayCandidatesOzone { 26 class SingleOverlay : public OverlayCandidatesOzone {
27 public: 27 public:
28 SingleOverlay() {} 28 SingleOverlay() {}
29 virtual ~SingleOverlay() {} 29 virtual ~SingleOverlay() {}
30 30
31 virtual void CheckOverlaySupport(OverlaySurfaceCandidateList* candidates) { 31 virtual void CheckOverlaySupport(
32 OverlaySurfaceCandidateList* candidates) OVERRIDE {
32 if (candidates->size() == 2) { 33 if (candidates->size() == 2) {
33 OverlayCandidatesOzone::OverlaySurfaceCandidate* first = 34 OverlayCandidatesOzone::OverlaySurfaceCandidate* first =
34 &(*candidates)[0]; 35 &(*candidates)[0];
35 OverlayCandidatesOzone::OverlaySurfaceCandidate* second = 36 OverlayCandidatesOzone::OverlaySurfaceCandidate* second =
36 &(*candidates)[1]; 37 &(*candidates)[1];
37 OverlayCandidatesOzone::OverlaySurfaceCandidate* overlay; 38 OverlayCandidatesOzone::OverlaySurfaceCandidate* overlay;
38 if (first->plane_z_order == 0) { 39 if (first->plane_z_order == 0) {
39 overlay = second; 40 overlay = second;
40 } else if (second->plane_z_order == 0) { 41 } else if (second->plane_z_order == 0) {
41 overlay = first; 42 overlay = first;
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 scoped_ptr<DriWindowDelegate> delegate( 223 scoped_ptr<DriWindowDelegate> delegate(
223 new DriWindowDelegateImpl(widget, screen_manager_)); 224 new DriWindowDelegateImpl(widget, screen_manager_));
224 delegate->Initialize(); 225 delegate->Initialize();
225 window_manager_->AddWindowDelegate(widget, delegate.Pass()); 226 window_manager_->AddWindowDelegate(widget, delegate.Pass());
226 } 227 }
227 228
228 return window_manager_->GetWindowDelegate(widget); 229 return window_manager_->GetWindowDelegate(widget);
229 } 230 }
230 231
231 } // namespace ui 232 } // namespace ui
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698