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

Side by Side Diff: services/native_viewport/platform_viewport_x11.cc

Issue 2011053003: Make PlatformViewport and NativeViewportImpl use Shell* instead of ApplicationImpl*. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: fix android Created 4 years, 6 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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 #include "services/native_viewport/platform_viewport.h" 5 #include "services/native_viewport/platform_viewport.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "mojo/converters/geometry/geometry_type_converters.h" 9 #include "mojo/converters/geometry/geometry_type_converters.h"
10 #include "mojo/converters/input_events/input_events_type_converters.h" 10 #include "mojo/converters/input_events/input_events_type_converters.h"
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 155
156 scoped_ptr<ui::PlatformEventSource> event_source_; 156 scoped_ptr<ui::PlatformEventSource> event_source_;
157 scoped_ptr<ui::PlatformWindow> platform_window_; 157 scoped_ptr<ui::PlatformWindow> platform_window_;
158 Delegate* delegate_; 158 Delegate* delegate_;
159 mojo::ViewportMetricsPtr metrics_; 159 mojo::ViewportMetricsPtr metrics_;
160 160
161 DISALLOW_COPY_AND_ASSIGN(PlatformViewportX11); 161 DISALLOW_COPY_AND_ASSIGN(PlatformViewportX11);
162 }; 162 };
163 163
164 // static 164 // static
165 scoped_ptr<PlatformViewport> PlatformViewport::Create( 165 scoped_ptr<PlatformViewport> PlatformViewport::Create(mojo::Shell* shell,
166 mojo::ApplicationImpl* application_, 166 Delegate* delegate) {
167 Delegate* delegate) {
168 return make_scoped_ptr(new PlatformViewportX11(delegate)); 167 return make_scoped_ptr(new PlatformViewportX11(delegate));
169 } 168 }
170 169
171 } // namespace native_viewport 170 } // namespace native_viewport
OLDNEW
« no previous file with comments | « services/native_viewport/platform_viewport_stub.cc ('k') | shell/android/native_viewport_application_loader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698