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

Side by Side Diff: components/view_manager/native_viewport/native_viewport_application_delegate.cc

Issue 1131523007: Move NativeViewport service into view_manager. This is a file move only. Further merging will happe… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 years, 7 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "components/native_viewport/native_viewport_application_delegate.h" 5 #include "components/view_manager/native_viewport/native_viewport_application_de legate.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "components/native_viewport/native_viewport_impl.h" 8 #include "components/view_manager/native_viewport/native_viewport_impl.h"
9 #include "components/native_viewport/public/cpp/args.h" 9 #include "components/view_manager/public/cpp/args.h"
10 #include "mojo/application/public/cpp/application_connection.h" 10 #include "mojo/application/public/cpp/application_connection.h"
11 #include "mojo/application/public/cpp/application_impl.h" 11 #include "mojo/application/public/cpp/application_impl.h"
12 #include "ui/events/event_switches.h" 12 #include "ui/events/event_switches.h"
13 #include "ui/events/platform/platform_event_source.h" 13 #include "ui/events/platform/platform_event_source.h"
14 #include "ui/gl/gl_surface.h" 14 #include "ui/gl/gl_surface.h"
15 15
16 namespace native_viewport { 16 namespace native_viewport {
17 17
18 NativeViewportApplicationDelegate::NativeViewportApplicationDelegate() 18 NativeViewportApplicationDelegate::NativeViewportApplicationDelegate()
19 : is_headless_(false) { 19 : is_headless_(false) {
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 55
56 void NativeViewportApplicationDelegate::Create( 56 void NativeViewportApplicationDelegate::Create(
57 mojo::ApplicationConnection* connection, 57 mojo::ApplicationConnection* connection,
58 mojo::InterfaceRequest<mojo::Gpu> request) { 58 mojo::InterfaceRequest<mojo::Gpu> request) {
59 if (!gpu_state_.get()) 59 if (!gpu_state_.get())
60 gpu_state_ = new gles2::GpuState; 60 gpu_state_ = new gles2::GpuState;
61 new gles2::GpuImpl(request.Pass(), gpu_state_); 61 new gles2::GpuImpl(request.Pass(), gpu_state_);
62 } 62 }
63 63
64 } // namespace native_viewport 64 } // namespace native_viewport
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698