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

Side by Side Diff: chrome/browser/android/vr_shell/BUILD.gn

Issue 2834543006: Hook up insecure content warnings for http webVR presentation. (Closed)
Patch Set: rebase Created 3 years, 8 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
« no previous file with comments | « no previous file | chrome/browser/android/vr_shell/textures/insecure_content_permanent_texture.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 import("//build/config/android/rules.gni") 5 import("//build/config/android/rules.gni")
6 import("//chrome/common/features.gni") 6 import("//chrome/common/features.gni")
7 import("//device/vr/features.gni") 7 import("//device/vr/features.gni")
8 import("//testing/test.gni") 8 import("//testing/test.gni")
9 9
10 assert(enable_vr) 10 assert(enable_vr)
(...skipping 18 matching lines...) Expand all
29 "mailbox_to_surface_bridge.cc", 29 "mailbox_to_surface_bridge.cc",
30 "mailbox_to_surface_bridge.h", 30 "mailbox_to_surface_bridge.h",
31 "non_presenting_gvr_delegate.cc", 31 "non_presenting_gvr_delegate.cc",
32 "non_presenting_gvr_delegate.h", 32 "non_presenting_gvr_delegate.h",
33 "textures/insecure_content_permanent_texture.cc", 33 "textures/insecure_content_permanent_texture.cc",
34 "textures/insecure_content_permanent_texture.h", 34 "textures/insecure_content_permanent_texture.h",
35 "textures/insecure_content_transient_texture.cc", 35 "textures/insecure_content_transient_texture.cc",
36 "textures/insecure_content_transient_texture.h", 36 "textures/insecure_content_transient_texture.h",
37 "textures/ui_texture.cc", 37 "textures/ui_texture.cc",
38 "textures/ui_texture.h", 38 "textures/ui_texture.h",
39 "ui_element.cc", 39 "ui_elements/permanent_security_warning.cc",
40 "ui_element.h", 40 "ui_elements/permanent_security_warning.h",
41 "ui_elements/textured_element.cc",
42 "ui_elements/textured_element.h",
43 "ui_elements/transient_security_warning.cc",
44 "ui_elements/transient_security_warning.h",
45 "ui_elements/ui_element.cc",
46 "ui_elements/ui_element.h",
41 "ui_interface.cc", 47 "ui_interface.cc",
42 "ui_interface.h", 48 "ui_interface.h",
43 "ui_scene.cc", 49 "ui_scene.cc",
44 "ui_scene.h", 50 "ui_scene.h",
45 "ui_scene_manager.cc", 51 "ui_scene_manager.cc",
46 "ui_scene_manager.h", 52 "ui_scene_manager.h",
47 "vr_compositor.cc", 53 "vr_compositor.cc",
48 "vr_compositor.h", 54 "vr_compositor.h",
49 "vr_controller.cc", 55 "vr_controller.cc",
50 "vr_controller.h", 56 "vr_controller.h",
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 } 115 }
110 } 116 }
111 117
112 if (enable_vr) { 118 if (enable_vr) {
113 test("vr_shell_unittests") { 119 test("vr_shell_unittests") {
114 sources = [ 120 sources = [
115 "fps_meter_unittest.cc", 121 "fps_meter_unittest.cc",
116 "gltf_parser_unittest.cc", 122 "gltf_parser_unittest.cc",
117 "test/paths.cc", 123 "test/paths.cc",
118 "test/paths.h", 124 "test/paths.h",
119 "ui_element_unittest.cc", 125 "ui_elements/ui_element_unittest.cc",
120 "ui_scene_unittest.cc", 126 "ui_scene_unittest.cc",
121 ] 127 ]
122 128
123 deps = [ 129 deps = [
124 ":vr_common", 130 ":vr_common",
125 "//base/test:run_all_unittests", 131 "//base/test:run_all_unittests",
126 "//base/test:test_support", 132 "//base/test:test_support",
127 "//chrome/browser", 133 "//chrome/browser",
128 "//testing/gtest", 134 "//testing/gtest",
129 "//third_party/WebKit/public:blink", 135 "//third_party/WebKit/public:blink",
130 "//ui/gfx/geometry", 136 "//ui/gfx/geometry",
131 ] 137 ]
132 138
133 # Ensure libgvr static library appears before gcc library in linking order. 139 # Ensure libgvr static library appears before gcc library in linking order.
134 # See https://crbug.com/704305 for details. 140 # See https://crbug.com/704305 for details.
135 libs = 141 libs =
136 [ "//third_party/gvr-android-sdk/libgvr_shim_static_${current_cpu}.a" ] 142 [ "//third_party/gvr-android-sdk/libgvr_shim_static_${current_cpu}.a" ]
137 143
138 data = [ 144 data = [
139 "test/data/sample_inline.gltf", 145 "test/data/sample_inline.gltf",
140 "test/data/sample_external.gltf", 146 "test/data/sample_external.gltf",
141 "test/data/sample.bin", 147 "test/data/sample.bin",
142 ] 148 ]
143 } 149 }
144 } 150 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/android/vr_shell/textures/insecure_content_permanent_texture.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698