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

Side by Side Diff: mojo/services/native_viewport/android/mojo_viewport.h

Issue 56243003: Fix clang build (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 1 month 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 | mojo/services/native_viewport/android/mojo_viewport.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 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 #ifndef MOJO_SERVICES_NATIVE_VIEWPORT_ANDROID_MOJO_VIEWPORT_H_ 5 #ifndef MOJO_SERVICES_NATIVE_VIEWPORT_ANDROID_MOJO_VIEWPORT_H_
6 #define MOJO_SERVICES_NATIVE_VIEWPORT_ANDROID_MOJO_VIEWPORT_H_ 6 #define MOJO_SERVICES_NATIVE_VIEWPORT_ANDROID_MOJO_VIEWPORT_H_
7 7
8 #include "base/android/jni_helper.h" 8 #include "base/android/jni_helper.h"
9 #include "base/android/scoped_java_ref.h" 9 #include "base/android/scoped_java_ref.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/memory/ref_counted.h" 11 #include "base/memory/ref_counted.h"
12 #include "base/memory/weak_ptr.h" 12 #include "base/memory/weak_ptr.h"
13 #include "base/single_thread_task_runner.h" 13 #include "base/single_thread_task_runner.h"
14 #include "mojo/services/native_viewport/native_viewport_android.h" 14 #include "mojo/services/native_viewport/native_viewport_android.h"
15 #include "ui/gl/gl_surface_egl.h" 15 #include "ui/gl/gl_surface_egl.h"
16 16
17 struct ANativeWindow; 17 struct ANativeWindow;
18 18
19 namespace mojo { 19 namespace mojo {
20 namespace services { 20 namespace services {
21 21
22 struct MojoViewportInit { 22 struct MojoViewportInit {
23 MojoViewportInit();
24 ~MojoViewportInit();
25
23 scoped_refptr<base::SingleThreadTaskRunner> ui_runner; 26 scoped_refptr<base::SingleThreadTaskRunner> ui_runner;
24 base::WeakPtr<NativeViewportAndroid> native_viewport; 27 base::WeakPtr<NativeViewportAndroid> native_viewport;
25 }; 28 };
26 29
27 class MojoViewport { 30 class MojoViewport {
28 public: 31 public:
29 static bool Register(JNIEnv* env); 32 static bool Register(JNIEnv* env);
30 33
31 static void CreateForActivity( 34 static void CreateForActivity(
32 jobject activity, MojoViewportInit* init); 35 jobject activity, MojoViewportInit* init);
(...skipping 15 matching lines...) Expand all
48 scoped_refptr<gfx::GLSurface> surface_; 51 scoped_refptr<gfx::GLSurface> surface_;
49 scoped_refptr<gfx::GLContext> gl_context_; 52 scoped_refptr<gfx::GLContext> gl_context_;
50 53
51 DISALLOW_COPY_AND_ASSIGN(MojoViewport); 54 DISALLOW_COPY_AND_ASSIGN(MojoViewport);
52 }; 55 };
53 56
54 } // namespace services 57 } // namespace services
55 } // namespace mojo 58 } // namespace mojo
56 59
57 #endif // MOJO_SERVICES_NATIVE_VIEWPORT_ANDROID_MOJO_VIEWPORT_H_ 60 #endif // MOJO_SERVICES_NATIVE_VIEWPORT_ANDROID_MOJO_VIEWPORT_H_
OLDNEW
« no previous file with comments | « no previous file | mojo/services/native_viewport/android/mojo_viewport.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698