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

Side by Side Diff: components/view_manager/native_viewport/platform_viewport_android.h

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 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 COMPONENTS_NATIVE_VIEWPORT_PLATFORM_VIEWPORT_ANDROID_H_ 5 #ifndef COMPONENTS_VIEW_MANAGER_NATIVE_VIEWPORT_PLATFORM_VIEWPORT_ANDROID_H_
6 #define COMPONENTS_NATIVE_VIEWPORT_PLATFORM_VIEWPORT_ANDROID_H_ 6 #define COMPONENTS_VIEW_MANAGER_NATIVE_VIEWPORT_PLATFORM_VIEWPORT_ANDROID_H_
7 7
8 #include "base/android/jni_weak_ref.h" 8 #include "base/android/jni_weak_ref.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
11 #include "components/native_viewport/platform_viewport.h" 11 #include "components/view_manager/native_viewport/platform_viewport.h"
12 #include "ui/events/event_constants.h" 12 #include "ui/events/event_constants.h"
13 #include "ui/gfx/geometry/rect.h" 13 #include "ui/gfx/geometry/rect.h"
14 #include "ui/gfx/geometry/size.h" 14 #include "ui/gfx/geometry/size.h"
15 #include "ui/gfx/sequential_id_generator.h" 15 #include "ui/gfx/sequential_id_generator.h"
16 16
17 namespace gpu { 17 namespace gpu {
18 class GLInProcessContext; 18 class GLInProcessContext;
19 } 19 }
20 20
21 struct ANativeWindow; 21 struct ANativeWindow;
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 mojo::ViewportMetricsPtr metrics_; 76 mojo::ViewportMetricsPtr metrics_;
77 ui::SequentialIDGenerator id_generator_; 77 ui::SequentialIDGenerator id_generator_;
78 78
79 base::WeakPtrFactory<PlatformViewportAndroid> weak_factory_; 79 base::WeakPtrFactory<PlatformViewportAndroid> weak_factory_;
80 80
81 DISALLOW_COPY_AND_ASSIGN(PlatformViewportAndroid); 81 DISALLOW_COPY_AND_ASSIGN(PlatformViewportAndroid);
82 }; 82 };
83 83
84 } // namespace native_viewport 84 } // namespace native_viewport
85 85
86 #endif // COMPONENTS_NATIVE_VIEWPORT_PLATFORM_VIEWPORT_ANDROID_H_ 86 #endif // COMPONENTS_VIEW_MANAGER_NATIVE_VIEWPORT_PLATFORM_VIEWPORT_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698