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

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

Issue 659713003: Use scoped_ptr::Pass instead of scoped_ptr::PassAs<T>. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Simplify 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/dri/ozone_platform_dri.cc ('k') | ui/views/bubble/bubble_frame_view.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 #include "ui/ozone/platform/dri/ozone_platform_gbm.h" 5 #include "ui/ozone/platform/dri/ozone_platform_gbm.h"
6 6
7 #include <dlfcn.h> 7 #include <dlfcn.h>
8 #include <gbm.h> 8 #include <gbm.h>
9 #include <stdlib.h> 9 #include <stdlib.h>
10 10
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 virtual scoped_ptr<PlatformWindow> CreatePlatformWindow( 97 virtual scoped_ptr<PlatformWindow> CreatePlatformWindow(
98 PlatformWindowDelegate* delegate, 98 PlatformWindowDelegate* delegate,
99 const gfx::Rect& bounds) override { 99 const gfx::Rect& bounds) override {
100 scoped_ptr<DriWindow> platform_window( 100 scoped_ptr<DriWindow> platform_window(
101 new DriWindow(delegate, 101 new DriWindow(delegate,
102 bounds, 102 bounds,
103 gpu_platform_support_host_.get(), 103 gpu_platform_support_host_.get(),
104 event_factory_ozone_.get(), 104 event_factory_ozone_.get(),
105 window_manager_.get())); 105 window_manager_.get()));
106 platform_window->Initialize(); 106 platform_window->Initialize();
107 return platform_window.PassAs<PlatformWindow>(); 107 return platform_window.Pass();
108 } 108 }
109 virtual scoped_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate() 109 virtual scoped_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate()
110 override { 110 override {
111 return scoped_ptr<NativeDisplayDelegate>(new NativeDisplayDelegateProxy( 111 return scoped_ptr<NativeDisplayDelegate>(new NativeDisplayDelegateProxy(
112 gpu_platform_support_host_.get(), device_manager_.get())); 112 gpu_platform_support_host_.get(), device_manager_.get()));
113 } 113 }
114 virtual void InitializeUI() override { 114 virtual void InitializeUI() override {
115 vt_manager_.reset(new VirtualTerminalManager()); 115 vt_manager_.reset(new VirtualTerminalManager());
116 // Needed since the browser process creates the accelerated widgets and that 116 // Needed since the browser process creates the accelerated widgets and that
117 // happens through SFO. 117 // happens through SFO.
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 }; 173 };
174 174
175 } // namespace 175 } // namespace
176 176
177 OzonePlatform* CreateOzonePlatformGbm() { 177 OzonePlatform* CreateOzonePlatformGbm() {
178 CommandLine* cmd = CommandLine::ForCurrentProcess(); 178 CommandLine* cmd = CommandLine::ForCurrentProcess();
179 return new OzonePlatformGbm(cmd->HasSwitch(switches::kOzoneUseSurfaceless)); 179 return new OzonePlatformGbm(cmd->HasSwitch(switches::kOzoneUseSurfaceless));
180 } 180 }
181 181
182 } // namespace ui 182 } // namespace ui
OLDNEW
« no previous file with comments | « ui/ozone/platform/dri/ozone_platform_dri.cc ('k') | ui/views/bubble/bubble_frame_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698