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

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

Issue 2279403003: blimp: Hook up the layer holding the tab content into Chrome. (Closed)
Patch Set: Addressed comments 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
« no previous file with comments | « blimp/client/DEPS ('k') | blimp/client/core/contents/blimp_contents_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: blimp/client/core/contents/BUILD.gn
diff --git a/blimp/client/core/contents/BUILD.gn b/blimp/client/core/contents/BUILD.gn
index 4f3e764329ef634487b86b835817fd077bacc93c..328faf35649b3982597cbebfe9f77144bb776273 100644
--- a/blimp/client/core/contents/BUILD.gn
+++ b/blimp/client/core/contents/BUILD.gn
@@ -15,6 +15,7 @@ source_set("contents") {
"blimp_contents_impl.h",
"blimp_contents_manager.cc",
"blimp_contents_manager.h",
+ "blimp_contents_view.h",
"blimp_navigation_controller_delegate.h",
"blimp_navigation_controller_impl.cc",
"blimp_navigation_controller_impl.h",
@@ -38,6 +39,7 @@ source_set("contents") {
deps = [
"//blimp/common",
"//components/url_formatter",
+ "//skia",
]
if (is_android) {
@@ -50,9 +52,20 @@ source_set("contents") {
"android/blimp_contents_observer_proxy.h",
"android/blimp_navigation_controller_impl_android.cc",
"android/blimp_navigation_controller_impl_android.h",
+ "blimp_contents_view_android.cc",
+ "blimp_contents_view_android.h",
]
- deps += [ ":jni_headers" ]
+ deps += [
+ ":jni_headers",
+ "//cc",
+ "//ui/android",
+ ]
+ } else {
+ sources += [
+ "blimp_contents_view_aura.cc",
+ "blimp_contents_view_aura.h",
+ ]
}
}
« no previous file with comments | « blimp/client/DEPS ('k') | blimp/client/core/contents/blimp_contents_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698