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

Side by Side Diff: services/native_viewport/ozone/platform_viewport_ozone.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, 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 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 "services/native_viewport/platform_viewport.h" 5 #include "services/native_viewport/platform_viewport.h"
6 6
7 #include "mojo/converters/geometry/geometry_type_converters.h" 7 #include "mojo/converters/geometry/geometry_type_converters.h"
8 #include "mojo/converters/input_events/input_events_type_converters.h" 8 #include "mojo/converters/input_events/input_events_type_converters.h"
9 #include "mojo/converters/input_events/mojo_extended_key_event_data.h" 9 #include "mojo/converters/input_events/mojo_extended_key_event_data.h"
10 #include "ui/events/event.h" 10 #include "ui/events/event.h"
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 void OnActivationChanged(bool active) override {} 117 void OnActivationChanged(bool active) override {}
118 118
119 scoped_ptr<ui::PlatformWindow> platform_window_; 119 scoped_ptr<ui::PlatformWindow> platform_window_;
120 Delegate* delegate_; 120 Delegate* delegate_;
121 mojo::ViewportMetricsPtr metrics_; 121 mojo::ViewportMetricsPtr metrics_;
122 122
123 DISALLOW_COPY_AND_ASSIGN(PlatformViewportOzone); 123 DISALLOW_COPY_AND_ASSIGN(PlatformViewportOzone);
124 }; 124 };
125 125
126 // static 126 // static
127 scoped_ptr<PlatformViewport> PlatformViewport::Create( 127 scoped_ptr<PlatformViewport> PlatformViewport::Create(mojo::Shell* shell,
128 mojo::ApplicationImpl* application_, 128 Delegate* delegate) {
129 Delegate* delegate) {
130 return scoped_ptr<PlatformViewport>(new PlatformViewportOzone(delegate)) 129 return scoped_ptr<PlatformViewport>(new PlatformViewportOzone(delegate))
131 .Pass(); 130 .Pass();
132 } 131 }
133 132
134 } // namespace native_viewport 133 } // namespace native_viewport
OLDNEW
« no previous file with comments | « services/native_viewport/native_viewport_impl.cc ('k') | services/native_viewport/platform_viewport.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698