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

Side by Side Diff: blimp/client/core/contents/BUILD.gn

Issue 2270323004: Add BlimpView to a Chrome tab when Blimp is enabled. (Closed)
Patch Set: Now owned by BlimpContentsViewAndroid and also implemented touch and sizing Created 4 years, 3 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 2016 The Chromium Authors. All rights reserved. 1 # Copyright 2016 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 if (is_android) { 5 if (is_android) {
6 import("//build/config/android/config.gni") 6 import("//build/config/android/config.gni")
7 import("//build/config/android/rules.gni") 7 import("//build/config/android/rules.gni")
8 } 8 }
9 9
10 source_set("contents") { 10 source_set("contents") {
(...skipping 14 matching lines...) Expand all
25 "navigation_feature.h", 25 "navigation_feature.h",
26 ] 26 ]
27 27
28 public_deps = [ 28 public_deps = [
29 "//base", 29 "//base",
30 "//blimp/client:feature", 30 "//blimp/client:feature",
31 "//blimp/client/public:public_headers", 31 "//blimp/client/public:public_headers",
32 "//blimp/net", 32 "//blimp/net",
33 "//net:net", 33 "//net:net",
34 "//ui/base/ime:text_input_types", 34 "//ui/base/ime:text_input_types",
35 "//ui/gfx:native_widget_types",
35 "//ui/gfx/geometry:geometry", 36 "//ui/gfx/geometry:geometry",
36 "//url", 37 "//url",
37 ] 38 ]
38 39
39 deps = [ 40 deps = [
40 "//blimp/common", 41 "//blimp/common",
41 "//components/url_formatter", 42 "//components/url_formatter",
42 "//skia", 43 "//skia",
43 ] 44 ]
44 45
45 if (is_android) { 46 if (is_android) {
46 sources += [ 47 sources += [
47 "android/blimp_contents_impl_android.cc", 48 "android/blimp_contents_impl_android.cc",
48 "android/blimp_contents_impl_android.h", 49 "android/blimp_contents_impl_android.h",
49 "android/blimp_contents_jni_registrar.cc", 50 "android/blimp_contents_jni_registrar.cc",
50 "android/blimp_contents_jni_registrar.h", 51 "android/blimp_contents_jni_registrar.h",
51 "android/blimp_contents_observer_proxy.cc", 52 "android/blimp_contents_observer_proxy.cc",
52 "android/blimp_contents_observer_proxy.h", 53 "android/blimp_contents_observer_proxy.h",
53 "android/blimp_navigation_controller_impl_android.cc", 54 "android/blimp_navigation_controller_impl_android.cc",
54 "android/blimp_navigation_controller_impl_android.h", 55 "android/blimp_navigation_controller_impl_android.h",
56 "android/blimp_view.cc",
57 "android/blimp_view.h",
55 "blimp_contents_view_android.cc", 58 "blimp_contents_view_android.cc",
56 "blimp_contents_view_android.h", 59 "blimp_contents_view_android.h",
57 ] 60 ]
58 61
62 public_deps += [ "//ui/android" ]
63
59 deps += [ 64 deps += [
60 ":jni_headers", 65 ":jni_headers",
61 "//cc", 66 "//cc",
62 "//ui/android", 67 "//ui/android",
68 "//ui/events:events",
63 ] 69 ]
64 } else { 70 } else {
65 sources += [ 71 sources += [
66 "blimp_contents_view_aura.cc", 72 "blimp_contents_view_aura.cc",
67 "blimp_contents_view_aura.h", 73 "blimp_contents_view_aura.h",
68 ] 74 ]
69 } 75 }
70 } 76 }
71 77
72 source_set("test_support") { 78 source_set("test_support") {
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 } 129 }
124 130
125 if (is_android) { 131 if (is_android) {
126 android_library("contents_java") { 132 android_library("contents_java") {
127 visibility = [ "//blimp/client/*" ] 133 visibility = [ "//blimp/client/*" ]
128 134
129 java_files = [ 135 java_files = [
130 "android/java/src/org/chromium/blimp/core/contents/BlimpContentsImpl.java" , 136 "android/java/src/org/chromium/blimp/core/contents/BlimpContentsImpl.java" ,
131 "android/java/src/org/chromium/blimp/core/contents/BlimpContentsObserverPr oxy.java", 137 "android/java/src/org/chromium/blimp/core/contents/BlimpContentsObserverPr oxy.java",
132 "android/java/src/org/chromium/blimp/core/contents/BlimpNavigationControll erImpl.java", 138 "android/java/src/org/chromium/blimp/core/contents/BlimpNavigationControll erImpl.java",
139 "android/java/src/org/chromium/blimp/core/contents/BlimpView.java",
133 ] 140 ]
134 141
135 deps = [ 142 deps = [
136 "//base:base_java", 143 "//base:base_java",
137 "//blimp/client/public:public_headers_java", 144 "//blimp/client/public:public_headers_java",
145 "//ui/android:ui_java",
138 ] 146 ]
139 } 147 }
140 148
141 generate_jni("jni_headers") { 149 generate_jni("jni_headers") {
142 visibility = [ ":*" ] 150 visibility = [ ":*" ]
143 151
144 sources = [ 152 sources = [
145 "android/java/src/org/chromium/blimp/core/contents/BlimpContentsImpl.java" , 153 "android/java/src/org/chromium/blimp/core/contents/BlimpContentsImpl.java" ,
146 "android/java/src/org/chromium/blimp/core/contents/BlimpContentsObserverPr oxy.java", 154 "android/java/src/org/chromium/blimp/core/contents/BlimpContentsObserverPr oxy.java",
147 "android/java/src/org/chromium/blimp/core/contents/BlimpNavigationControll erImpl.java", 155 "android/java/src/org/chromium/blimp/core/contents/BlimpNavigationControll erImpl.java",
156 "android/java/src/org/chromium/blimp/core/contents/BlimpView.java",
148 ] 157 ]
149 158
150 jni_package = "blimp/client/core/contents" 159 jni_package = "blimp/client/core/contents"
151 } 160 }
152 } 161 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698