 Chromium Code Reviews
 Chromium Code Reviews Issue 2399533002:
  Pull in vr_shell code for webvr  (Closed)
    
  
    Issue 2399533002:
  Pull in vr_shell code for webvr  (Closed) 
  | OLD | NEW | 
|---|---|
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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/chromecast_build.gni") | 5 import("//build/config/chromecast_build.gni") | 
| 6 import("//build/config/crypto.gni") | 6 import("//build/config/crypto.gni") | 
| 7 import("//build/config/features.gni") | 7 import("//build/config/features.gni") | 
| 8 import("//build/config/ui.gni") | 8 import("//build/config/ui.gni") | 
| 9 import("//build/split_static_library.gni") | 9 import("//build/split_static_library.gni") | 
| 10 import("//chrome/common/features.gni") | 10 import("//chrome/common/features.gni") | 
| (...skipping 2185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2196 "webui/offline/offline_internals_ui_message_handler.h", | 2196 "webui/offline/offline_internals_ui_message_handler.h", | 
| 2197 "webui/popular_sites_internals_message_handler.cc", | 2197 "webui/popular_sites_internals_message_handler.cc", | 
| 2198 "webui/popular_sites_internals_message_handler.h", | 2198 "webui/popular_sites_internals_message_handler.h", | 
| 2199 "webui/popular_sites_internals_ui.cc", | 2199 "webui/popular_sites_internals_ui.cc", | 
| 2200 "webui/popular_sites_internals_ui.h", | 2200 "webui/popular_sites_internals_ui.h", | 
| 2201 "webui/snippets_internals_message_handler.cc", | 2201 "webui/snippets_internals_message_handler.cc", | 
| 2202 "webui/snippets_internals_message_handler.h", | 2202 "webui/snippets_internals_message_handler.h", | 
| 2203 "webui/snippets_internals_ui.cc", | 2203 "webui/snippets_internals_ui.cc", | 
| 2204 "webui/snippets_internals_ui.h", | 2204 "webui/snippets_internals_ui.h", | 
| 2205 ] | 2205 ] | 
| 2206 if (enable_vr_shell) { | 2206 if (enable_vr_shell || enable_webvr) { | 
| 2207 defines += [ "ENABLE_VR_SHELL" ] | 2207 if (enable_vr_shell) { | 
| 2208 defines += [ "ENABLE_VR_SHELL" ] | |
| 2209 } | |
| 2208 sources += [ | 2210 sources += [ | 
| 2209 "webui/vr_shell/vr_shell_ui_message_handler.cc", | 2211 "webui/vr_shell/vr_shell_ui_message_handler.cc", | 
| 
agrieve
2016/10/07 17:36:43
and here
 
bshe
2016/10/07 20:36:22
ditto
 | |
| 2210 "webui/vr_shell/vr_shell_ui_message_handler.h", | 2212 "webui/vr_shell/vr_shell_ui_message_handler.h", | 
| 2211 "webui/vr_shell/vr_shell_ui_ui.cc", | 2213 "webui/vr_shell/vr_shell_ui_ui.cc", | 
| 2212 "webui/vr_shell/vr_shell_ui_ui.h", | 2214 "webui/vr_shell/vr_shell_ui_ui.h", | 
| 2213 ] | 2215 ] | 
| 2214 configs += [ "//third_party/gvr-android-sdk:libgvr_config" ] | 2216 configs += [ "//third_party/gvr-android-sdk:libgvr_config" ] | 
| 2215 deps += [ "//chrome/browser/android/vr_shell:vr_shell" ] | 2217 deps += [ "//chrome/browser/android/vr_shell:vr_common" ] | 
| 2216 } | 2218 } | 
| 2217 if (enable_vr_shell_ui_dev) { | 2219 if (enable_vr_shell_ui_dev) { | 
| 2218 assert(enable_vr_shell) | 2220 assert(enable_vr_shell) | 
| 2219 defines += [ "ENABLE_VR_SHELL_UI_DEV" ] | 2221 defines += [ "ENABLE_VR_SHELL_UI_DEV" ] | 
| 2220 } | 2222 } | 
| 2221 deps += [ | 2223 deps += [ | 
| 2222 "//chrome/browser:jni_headers", | 2224 "//chrome/browser:jni_headers", | 
| 2223 "//components/web_contents_delegate_android", | 2225 "//components/web_contents_delegate_android", | 
| 2224 ] | 2226 ] | 
| 2225 deps -= [ "//ui/events" ] | 2227 deps -= [ "//ui/events" ] | 
| (...skipping 1188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3414 "test/test_confirm_bubble_model.cc", | 3416 "test/test_confirm_bubble_model.cc", | 
| 3415 "test/test_confirm_bubble_model.h", | 3417 "test/test_confirm_bubble_model.h", | 
| 3416 ] | 3418 ] | 
| 3417 deps += [ "//chrome/test:test_support_ui" ] | 3419 deps += [ "//chrome/test:test_support_ui" ] | 
| 3418 } | 3420 } | 
| 3419 | 3421 | 
| 3420 if (enable_extensions) { | 3422 if (enable_extensions) { | 
| 3421 deps += [ "//extensions/browser" ] | 3423 deps += [ "//extensions/browser" ] | 
| 3422 } | 3424 } | 
| 3423 } | 3425 } | 
| OLD | NEW |