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

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

Issue 1164553004: Revert of Mandoline: Remove native_viewport.mojom (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 #ifndef COMPONENTS_VIEW_MANAGER_NATIVE_VIEWPORT_PLATFORM_VIEWPORT_ANDROID_H_ 5 #ifndef COMPONENTS_VIEW_MANAGER_NATIVE_VIEWPORT_PLATFORM_VIEWPORT_ANDROID_H_
6 #define COMPONENTS_VIEW_MANAGER_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"
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 void Hide() override; 66 void Hide() override;
67 void Close() override; 67 void Close() override;
68 gfx::Size GetSize() override; 68 gfx::Size GetSize() override;
69 void SetBounds(const gfx::Rect& bounds) override; 69 void SetBounds(const gfx::Rect& bounds) override;
70 70
71 void ReleaseWindow(); 71 void ReleaseWindow();
72 72
73 Delegate* const delegate_; 73 Delegate* const delegate_;
74 JavaObjectWeakGlobalRef java_platform_viewport_android_; 74 JavaObjectWeakGlobalRef java_platform_viewport_android_;
75 ANativeWindow* window_; 75 ANativeWindow* window_;
76 mojo::ViewportMetricsPtr metrics_;
76 ui::SequentialIDGenerator id_generator_; 77 ui::SequentialIDGenerator id_generator_;
77 78
78 gfx::Size size_;
79
80 base::WeakPtrFactory<PlatformViewportAndroid> weak_factory_; 79 base::WeakPtrFactory<PlatformViewportAndroid> weak_factory_;
81 80
82 DISALLOW_COPY_AND_ASSIGN(PlatformViewportAndroid); 81 DISALLOW_COPY_AND_ASSIGN(PlatformViewportAndroid);
83 }; 82 };
84 83
85 } // namespace native_viewport 84 } // namespace native_viewport
86 85
87 #endif // COMPONENTS_VIEW_MANAGER_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