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

Unified Diff: blimp/client/core/contents/BUILD.gn

Issue 2270323004: Add BlimpView to a Chrome tab when Blimp is enabled. (Closed)
Patch Set: addressed nit, renamed CreateForTesting and piped through touch handling Created 4 years, 4 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 side-by-side diff with in-line comments
Download patch
Index: blimp/client/core/contents/BUILD.gn
diff --git a/blimp/client/core/contents/BUILD.gn b/blimp/client/core/contents/BUILD.gn
index 4e153d8ff4c072ea52464f2beeb99b6454802c34..874243f2851aacd408331dddc45bf962b0537fb6 100644
--- a/blimp/client/core/contents/BUILD.gn
+++ b/blimp/client/core/contents/BUILD.gn
@@ -34,6 +34,7 @@ source_set("contents") {
"//blimp/net",
"//net:net",
"//ui/base/ime:text_input_types",
+ "//ui/gfx:native_widget_types",
"//ui/gfx/geometry:geometry",
"//url",
]
@@ -55,14 +56,19 @@ source_set("contents") {
"android/blimp_contents_observer_proxy.h",
"android/blimp_navigation_controller_impl_android.cc",
"android/blimp_navigation_controller_impl_android.h",
+ "android/blimp_view.cc",
+ "android/blimp_view.h",
"blimp_contents_view_android.cc",
"blimp_contents_view_android.h",
]
+ public_deps += [ "//ui/android" ]
+
deps += [
":jni_headers",
"//cc",
"//ui/android",
+ "//ui/events:events",
]
} else {
sources += [
@@ -121,10 +127,15 @@ source_set("unit_tests") {
"//net",
"//net:test_support",
"//testing/gtest",
+ "//ui/gfx:native_widget_types",
"//ui/gfx:test_support",
"//ui/gfx/geometry:geometry",
"//url",
]
+
+ if (is_android) {
+ deps += [ "//ui/android" ]
+ }
}
if (is_android) {
@@ -135,11 +146,13 @@ if (is_android) {
"android/java/src/org/chromium/blimp/core/contents/BlimpContentsImpl.java",
"android/java/src/org/chromium/blimp/core/contents/BlimpContentsObserverProxy.java",
"android/java/src/org/chromium/blimp/core/contents/BlimpNavigationControllerImpl.java",
+ "android/java/src/org/chromium/blimp/core/contents/BlimpView.java",
]
deps = [
"//base:base_java",
"//blimp/client/public:public_headers_java",
+ "//ui/android:ui_java",
]
}
@@ -150,6 +163,7 @@ if (is_android) {
"android/java/src/org/chromium/blimp/core/contents/BlimpContentsImpl.java",
"android/java/src/org/chromium/blimp/core/contents/BlimpContentsObserverProxy.java",
"android/java/src/org/chromium/blimp/core/contents/BlimpNavigationControllerImpl.java",
+ "android/java/src/org/chromium/blimp/core/contents/BlimpView.java",
]
jni_package = "blimp/client/core/contents"

Powered by Google App Engine
This is Rietveld 408576698