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

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: Magic now happens 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 13 matching lines...) Expand all
24 "navigation_feature.h", 24 "navigation_feature.h",
25 ] 25 ]
26 26
27 public_deps = [ 27 public_deps = [
28 "//base", 28 "//base",
29 "//blimp/client:feature", 29 "//blimp/client:feature",
30 "//blimp/client/public:public_headers", 30 "//blimp/client/public:public_headers",
31 "//blimp/net", 31 "//blimp/net",
32 "//net:net", 32 "//net:net",
33 "//ui/base/ime:text_input_types", 33 "//ui/base/ime:text_input_types",
34 "//ui/gfx:native_widget_types",
34 "//ui/gfx/geometry:geometry", 35 "//ui/gfx/geometry:geometry",
35 "//url", 36 "//url",
36 ] 37 ]
37 38
38 deps = [ 39 deps = [
39 "//blimp/common", 40 "//blimp/common",
40 "//components/url_formatter", 41 "//components/url_formatter",
41 ] 42 ]
42 43
43 if (is_android) { 44 if (is_android) {
44 sources += [ 45 sources += [
45 "android/blimp_contents_impl_android.cc", 46 "android/blimp_contents_impl_android.cc",
46 "android/blimp_contents_impl_android.h", 47 "android/blimp_contents_impl_android.h",
47 "android/blimp_contents_jni_registrar.cc", 48 "android/blimp_contents_jni_registrar.cc",
48 "android/blimp_contents_jni_registrar.h", 49 "android/blimp_contents_jni_registrar.h",
49 "android/blimp_contents_observer_proxy.cc", 50 "android/blimp_contents_observer_proxy.cc",
50 "android/blimp_contents_observer_proxy.h", 51 "android/blimp_contents_observer_proxy.h",
51 "android/blimp_navigation_controller_impl_android.cc", 52 "android/blimp_navigation_controller_impl_android.cc",
52 "android/blimp_navigation_controller_impl_android.h", 53 "android/blimp_navigation_controller_impl_android.h",
54 "android/blimp_view.cc",
55 "android/blimp_view.h",
53 ] 56 ]
54 57
58 public_deps += [ "//ui/android" ]
59
55 deps += [ ":jni_headers" ] 60 deps += [ ":jni_headers" ]
56 } 61 }
57 } 62 }
58 63
59 source_set("test_support") { 64 source_set("test_support") {
60 testonly = true 65 testonly = true
61 66
62 sources = [ 67 sources = [
63 "fake_navigation_feature.cc", 68 "fake_navigation_feature.cc",
64 "fake_navigation_feature.h", 69 "fake_navigation_feature.h",
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 } 115 }
111 116
112 if (is_android) { 117 if (is_android) {
113 android_library("contents_java") { 118 android_library("contents_java") {
114 visibility = [ "//blimp/client/*" ] 119 visibility = [ "//blimp/client/*" ]
115 120
116 java_files = [ 121 java_files = [
117 "android/java/src/org/chromium/blimp/core/contents/BlimpContentsImpl.java" , 122 "android/java/src/org/chromium/blimp/core/contents/BlimpContentsImpl.java" ,
118 "android/java/src/org/chromium/blimp/core/contents/BlimpContentsObserverPr oxy.java", 123 "android/java/src/org/chromium/blimp/core/contents/BlimpContentsObserverPr oxy.java",
119 "android/java/src/org/chromium/blimp/core/contents/BlimpNavigationControll erImpl.java", 124 "android/java/src/org/chromium/blimp/core/contents/BlimpNavigationControll erImpl.java",
125 "android/java/src/org/chromium/blimp/core/contents/BlimpView.java",
120 ] 126 ]
121 127
122 deps = [ 128 deps = [
123 "//base:base_java", 129 "//base:base_java",
124 "//blimp/client/public:public_headers_java", 130 "//blimp/client/public:public_headers_java",
131 "//ui/android:ui_java",
125 ] 132 ]
126 } 133 }
127 134
128 generate_jni("jni_headers") { 135 generate_jni("jni_headers") {
129 visibility = [ ":*" ] 136 visibility = [ ":*" ]
130 137
131 sources = [ 138 sources = [
132 "android/java/src/org/chromium/blimp/core/contents/BlimpContentsImpl.java" , 139 "android/java/src/org/chromium/blimp/core/contents/BlimpContentsImpl.java" ,
133 "android/java/src/org/chromium/blimp/core/contents/BlimpContentsObserverPr oxy.java", 140 "android/java/src/org/chromium/blimp/core/contents/BlimpContentsObserverPr oxy.java",
134 "android/java/src/org/chromium/blimp/core/contents/BlimpNavigationControll erImpl.java", 141 "android/java/src/org/chromium/blimp/core/contents/BlimpNavigationControll erImpl.java",
142 "android/java/src/org/chromium/blimp/core/contents/BlimpView.java",
135 ] 143 ]
136 144
137 jni_package = "blimp/client/core/contents" 145 jni_package = "blimp/client/core/contents"
138 } 146 }
139 } 147 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698