| 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/crypto.gni") | 5 import("//build/config/crypto.gni") |
| 6 import("//build/config/features.gni") | 6 import("//build/config/features.gni") |
| 7 import("//build/config/ui.gni") | 7 import("//build/config/ui.gni") |
| 8 | 8 |
| 9 gypi_values = exec_script( | 9 gypi_values = exec_script("//build/gypi_to_gn.py", |
| 10 "//build/gypi_to_gn.py", | 10 [ rebase_path("../../chrome_browser_ui.gypi") ], |
| 11 [ rebase_path("../../chrome_browser_ui.gypi") ], | 11 "scope", |
| 12 "scope", | 12 [ "../../chrome_browser_ui.gypi" ]) |
| 13 [ "../../chrome_browser_ui.gypi" ]) | |
| 14 | 13 |
| 15 static_library("ui") { | 14 static_library("ui") { |
| 16 output_name = "browser_ui" | 15 output_name = "browser_ui" |
| 17 | 16 |
| 18 sources = [] | 17 sources = [] |
| 19 defines = [] | 18 defines = [] |
| 20 libs = [] | 19 libs = [] |
| 21 | 20 |
| 22 configs += [ | 21 configs += [ |
| 23 "//build/config/compiler:wexit_time_destructors", | 22 "//build/config/compiler:wexit_time_destructors", |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 74 "//ui/gfx/geometry", | 73 "//ui/gfx/geometry", |
| 75 "//ui/message_center", | 74 "//ui/message_center", |
| 76 "//ui/native_theme", | 75 "//ui/native_theme", |
| 77 "//ui/resources", | 76 "//ui/resources", |
| 78 "//ui/snapshot", | 77 "//ui/snapshot", |
| 79 "//ui/strings", | 78 "//ui/strings", |
| 80 ] | 79 ] |
| 81 | 80 |
| 82 if (!is_ios) { | 81 if (!is_ios) { |
| 83 sources += rebase_path(gypi_values.chrome_browser_ui_non_ios_sources, | 82 sources += rebase_path(gypi_values.chrome_browser_ui_non_ios_sources, |
| 84 ".", "//chrome") | 83 ".", |
| 84 "//chrome") |
| 85 deps += [ | 85 deps += [ |
| 86 "//chrome/browser/devtools", | 86 "//chrome/browser/devtools", |
| 87 "//chrome/browser/ui/views", | 87 "//chrome/browser/ui/views", |
| 88 "//chrome/browser/ui/webui/omnibox:mojo_bindings", | 88 "//chrome/browser/ui/webui/omnibox:mojo_bindings", |
| 89 "//chrome/installer/util", | 89 "//chrome/installer/util", |
| 90 "//components/autofill/content/browser:risk_proto", | 90 "//components/autofill/content/browser:risk_proto", |
| 91 "//components/power", | 91 "//components/power", |
| 92 "//device/nfc", | 92 "//device/nfc", |
| 93 "//media", | 93 "//media", |
| 94 "//mojo/edk/system", | 94 "//mojo/edk/system", |
| 95 "//net:net_with_v8", | 95 "//net:net_with_v8", |
| 96 "//storage/browser", | 96 "//storage/browser", |
| 97 "//storage/common", | 97 "//storage/common", |
| 98 "//third_party/WebKit/public:resources", | 98 "//third_party/WebKit/public:resources", |
| 99 "//third_party/adobe/flash:flapper_version_h", | 99 "//third_party/adobe/flash:flapper_version_h", |
| 100 "//third_party/expat", | 100 "//third_party/expat", |
| 101 "//third_party/hunspell", | 101 "//third_party/hunspell", |
| 102 "//third_party/leveldatabase", | 102 "//third_party/leveldatabase", |
| 103 "//third_party/npapi", | 103 "//third_party/npapi", |
| 104 "//third_party/libjingle", | 104 "//third_party/libjingle", |
| 105 "//third_party/re2", | 105 "//third_party/re2", |
| 106 "//ui/compositor", | 106 "//ui/compositor", |
| 107 "//ui/surface", | 107 "//ui/surface", |
| 108 "//ui/web_dialogs", | 108 "//ui/web_dialogs", |
| 109 "//v8", | 109 "//v8", |
| 110 ] | 110 ] |
| 111 |
| 111 # TODO(GYP) | 112 # TODO(GYP) |
| 112 #'defines': [ | 113 #'defines': [ |
| 113 # '<@(nacl_defines)', | 114 # '<@(nacl_defines)', |
| 114 #], | 115 #], |
| 115 #'direct_dependent_settings': { | 116 #'direct_dependent_settings': { |
| 116 # 'defines': [ | 117 # 'defines': [ |
| 117 # '<@(nacl_defines)', | 118 # '<@(nacl_defines)', |
| 118 # ], | 119 # ], |
| 119 # }, | 120 # }, |
| 120 } else { | 121 } else { |
| 121 # iOS. | 122 # iOS. |
| 122 sources += rebase_path(gypi_values.chrome_browser_ui_ios_sources, | 123 sources += |
| 123 ".", "//chrome") | 124 rebase_path(gypi_values.chrome_browser_ui_ios_sources, ".", "//chrome") |
| 124 deps += [ "//net" ] | 125 deps += [ "//net" ] |
| 125 } | 126 } |
| 126 | 127 |
| 127 if (!is_android && !is_ios) { | 128 if (!is_android && !is_ios) { |
| 128 sources += rebase_path(gypi_values.chrome_browser_ui_non_mobile_sources, | 129 sources += rebase_path(gypi_values.chrome_browser_ui_non_mobile_sources, |
| 129 ".", "//chrome") | 130 ".", |
| 131 "//chrome") |
| 130 deps += [ "//device/bluetooth" ] | 132 deps += [ "//device/bluetooth" ] |
| 131 } | 133 } |
| 132 | 134 |
| 133 if (enable_basic_printing || enable_print_preview) { | 135 if (enable_basic_printing || enable_print_preview) { |
| 134 deps += [ "//printing" ] | 136 deps += [ "//printing" ] |
| 135 } | 137 } |
| 136 | 138 |
| 137 if (enable_one_click_signin) { | 139 if (enable_one_click_signin) { |
| 138 sources += rebase_path( | 140 sources += |
| 139 gypi_values.chrome_browser_ui_one_click_signin_sources, | 141 rebase_path(gypi_values.chrome_browser_ui_one_click_signin_sources, |
| 140 ".", "//chrome") | 142 ".", |
| 143 "//chrome") |
| 141 } | 144 } |
| 142 if (enable_task_manager) { | 145 if (enable_task_manager) { |
| 143 sources += rebase_path(gypi_values.chrome_browser_ui_task_manager_sources, | 146 sources += rebase_path(gypi_values.chrome_browser_ui_task_manager_sources, |
| 144 ".", "//chrome") | 147 ".", |
| 148 "//chrome") |
| 145 if (!toolkit_views || is_mac) { | 149 if (!toolkit_views || is_mac) { |
| 146 sources -= [ "views/task_manager_view.cc" ] | 150 sources -= [ "views/task_manager_view.cc" ] |
| 147 } | 151 } |
| 148 } | 152 } |
| 149 if (!enable_nacl) { | 153 if (!enable_nacl) { |
| 150 sources += rebase_path(gypi_values.chrome_browser_ui_nacl_sources, | 154 sources += |
| 151 ".", "//chrome") | 155 rebase_path(gypi_values.chrome_browser_ui_nacl_sources, ".", "//chrome") |
| 152 deps += [ | 156 deps += [ |
| 153 #"//native_client/src/trusted/service_runtime/service_runtime.gyp:sel", T
ODO(GYP) | 157 #"//native_client/src/trusted/service_runtime/service_runtime.gyp:sel", T
ODO(GYP) |
| 154 ] | 158 ] |
| 155 } | 159 } |
| 156 if (enable_configuration_policy) { | 160 if (enable_configuration_policy) { |
| 157 sources += rebase_path(gypi_values.chrome_browser_ui_policy_sources, | 161 sources += rebase_path(gypi_values.chrome_browser_ui_policy_sources, |
| 158 ".", "//chrome") | 162 ".", |
| 163 "//chrome") |
| 159 deps += [ "//components/policy" ] | 164 deps += [ "//components/policy" ] |
| 160 } | 165 } |
| 161 if (enable_plugins) { | 166 if (enable_plugins) { |
| 162 sources += rebase_path(gypi_values.chrome_browser_ui_plugin_sources, | 167 sources += rebase_path(gypi_values.chrome_browser_ui_plugin_sources, |
| 163 ".", "//chrome") | 168 ".", |
| 169 "//chrome") |
| 164 deps += [ "//ppapi:ppapi_ipc" ] | 170 deps += [ "//ppapi:ppapi_ipc" ] |
| 165 } | 171 } |
| 166 if (safe_browsing_mode == 1) { | 172 if (safe_browsing_mode == 1) { |
| 167 defines += [ "FULL_SAFE_BROWSING" ] | 173 defines += [ "FULL_SAFE_BROWSING" ] |
| 168 deps += [ | 174 deps += [ |
| 169 "//chrome/browser/safe_browsing:chunk_proto", | 175 "//chrome/browser/safe_browsing:chunk_proto", |
| 170 "//chrome/common/safe_browsing:proto", | 176 "//chrome/common/safe_browsing:proto", |
| 171 "//chrome/browser/safe_browsing:report_proto", | 177 "//chrome/browser/safe_browsing:report_proto", |
| 172 ] | 178 ] |
| 173 } | 179 } |
| 174 if (is_chromeos) { | 180 if (is_chromeos) { |
| 175 sources += rebase_path(gypi_values.chrome_browser_ui_chromeos_sources, | 181 sources += rebase_path(gypi_values.chrome_browser_ui_chromeos_sources, |
| 176 ".", "//chrome") | 182 ".", |
| 177 deps += [ | 183 "//chrome") |
| 178 "//chrome/browser/chromeos", | 184 deps += [ "//chrome/browser/chromeos" ] |
| 179 ] | |
| 180 } else { | 185 } else { |
| 181 sources += rebase_path(gypi_values.chrome_browser_ui_non_chromeos_sources, | 186 sources += rebase_path(gypi_values.chrome_browser_ui_non_chromeos_sources, |
| 182 ".", "//chrome") | 187 ".", |
| 188 "//chrome") |
| 183 } | 189 } |
| 184 if (use_cups) { | 190 if (use_cups) { |
| 185 configs += [ "//printing:cups" ] | 191 configs += [ "//printing:cups" ] |
| 186 } | 192 } |
| 187 if (use_ash) { | 193 if (use_ash) { |
| 188 sources += rebase_path(gypi_values.chrome_browser_ui_ash_sources, | 194 sources += |
| 189 ".", "//chrome") | 195 rebase_path(gypi_values.chrome_browser_ui_ash_sources, ".", "//chrome") |
| 190 deps += [ | 196 deps += [ |
| 191 "//ash", | 197 "//ash", |
| 192 "//ash:ash_with_content", | 198 "//ash:ash_with_content", |
| 193 "//ash/strings", | 199 "//ash/strings", |
| 194 "//components/user_manager", | 200 "//components/user_manager", |
| 195 ] | 201 ] |
| 196 if (!is_chromeos) { | 202 if (!is_chromeos) { |
| 197 sources += rebase_path(gypi_values.chrome_browser_ui_ash_non_chromeos, | 203 sources += rebase_path(gypi_values.chrome_browser_ui_ash_non_chromeos, |
| 198 ".", "//chrome") | 204 ".", |
| 205 "//chrome") |
| 199 } | 206 } |
| 200 } else { # Not ash. | 207 } else { # Not ash. |
| 201 sources += rebase_path(gypi_values.chrome_browser_ui_non_ash_sources, | 208 sources += rebase_path(gypi_values.chrome_browser_ui_non_ash_sources, |
| 202 ".", "//chrome") | 209 ".", |
| 210 "//chrome") |
| 203 } | 211 } |
| 204 if (use_athena) { | 212 if (use_athena) { |
| 205 sources += rebase_path(gypi_values.chrome_browser_ui_athena_sources, | 213 sources += rebase_path(gypi_values.chrome_browser_ui_athena_sources, |
| 206 ".", "//chrome") | 214 ".", |
| 215 "//chrome") |
| 207 } else { # Not athena. | 216 } else { # Not athena. |
| 208 if (!is_android) { | 217 if (!is_android) { |
| 209 sources += rebase_path( | 218 sources += rebase_path( |
| 210 gypi_values.chrome_browser_ui_non_athena_non_android_sources, | 219 gypi_values.chrome_browser_ui_non_athena_non_android_sources, |
| 211 ".", "//chrome") | 220 ".", |
| 221 "//chrome") |
| 212 } | 222 } |
| 213 if (use_ash) { | 223 if (use_ash) { |
| 214 sources += rebase_path( | 224 sources += |
| 215 gypi_values.chrome_browser_ui_ash_non_athena_sources, | 225 rebase_path(gypi_values.chrome_browser_ui_ash_non_athena_sources, |
| 216 ".", "//chrome") | 226 ".", |
| 227 "//chrome") |
| 217 } | 228 } |
| 218 } | 229 } |
| 219 if (toolkit_views) { | 230 if (toolkit_views) { |
| 220 sources += rebase_path(gypi_values.chrome_browser_ui_views_sources, | 231 sources += rebase_path(gypi_values.chrome_browser_ui_views_sources, |
| 221 ".", "//chrome") | 232 ".", |
| 233 "//chrome") |
| 222 deps += [ "//components/constrained_window" ] | 234 deps += [ "//components/constrained_window" ] |
| 223 if (!is_chromeos) { | 235 if (!is_chromeos) { |
| 224 sources += rebase_path( | 236 sources += |
| 225 gypi_values.chrome_browser_ui_views_non_chromeos_sources, | 237 rebase_path(gypi_values.chrome_browser_ui_views_non_chromeos_sources, |
| 226 ".", "//chrome") | 238 ".", |
| 239 "//chrome") |
| 227 } | 240 } |
| 228 if (is_mac) { | 241 if (is_mac) { |
| 229 if (mac_views_browser) { | 242 if (mac_views_browser) { |
| 230 sources -= [ "cocoa/browser_window_factory_cocoa.mm" ] | 243 sources -= [ "cocoa/browser_window_factory_cocoa.mm" ] |
| 231 } else { | 244 } else { |
| 232 sources -= [ "views/frame/browser_window_factory.cc" ] | 245 sources -= [ "views/frame/browser_window_factory.cc" ] |
| 233 } | 246 } |
| 234 } else { | 247 } else { |
| 235 sources += rebase_path( | 248 sources += |
| 236 gypi_values.chrome_browser_ui_views_non_mac_sources, | 249 rebase_path(gypi_values.chrome_browser_ui_views_non_mac_sources, |
| 237 ".", "//chrome") | 250 ".", |
| 238 deps += [ | 251 "//chrome") |
| 239 "//extensions/components/native_app_window", | 252 deps += [ "//extensions/components/native_app_window" ] |
| 240 ] | |
| 241 } | 253 } |
| 242 if (use_ash) { | 254 if (use_ash) { |
| 243 sources += rebase_path(gypi_values.chrome_browser_ui_ash_views_sources, | 255 sources += rebase_path(gypi_values.chrome_browser_ui_ash_views_sources, |
| 244 ".", "//chrome") | 256 ".", |
| 257 "//chrome") |
| 245 } | 258 } |
| 246 } | 259 } |
| 247 if (use_aura && !use_ozone && is_desktop_linux) { | 260 if (use_aura && !use_ozone && is_desktop_linux) { |
| 248 deps += [ | 261 deps += [ |
| 249 "//build/config/linux:gio", | 262 "//build/config/linux:gio", |
| 263 |
| 250 # gtk2 is the only component that can interact with gtk2 in our new | 264 # gtk2 is the only component that can interact with gtk2 in our new |
| 251 # world. | 265 # world. |
| 252 "//chrome/browser/ui/libgtk2ui", | 266 "//chrome/browser/ui/libgtk2ui", |
| 253 ] | 267 ] |
| 254 } | 268 } |
| 255 if (is_win || is_mac || is_desktop_linux) { | 269 if (is_win || is_mac || is_desktop_linux) { |
| 256 sources += rebase_path(gypi_values.chrome_browser_ui_desktop_sources, | 270 sources += rebase_path(gypi_values.chrome_browser_ui_desktop_sources, |
| 257 ".", "//chrome") | 271 ".", |
| 272 "//chrome") |
| 258 } | 273 } |
| 259 if (use_aura) { | 274 if (use_aura) { |
| 260 sources += rebase_path(gypi_values.chrome_browser_ui_aura_sources, | 275 sources += |
| 261 ".", "//chrome") | 276 rebase_path(gypi_values.chrome_browser_ui_aura_sources, ".", "//chrome") |
| 262 deps += [ | 277 deps += [ |
| 263 # aura uses some of ash resources. | 278 # aura uses some of ash resources. |
| 264 "//ash/resources", | 279 "//ash/resources", |
| 265 "//ui/aura", | 280 "//ui/aura", |
| 266 "//ui/keyboard", | 281 "//ui/keyboard", |
| 267 "//ui/keyboard:resources", | 282 "//ui/keyboard:resources", |
| 268 "//ui/wm", | 283 "//ui/wm", |
| 269 ] | 284 ] |
| 270 if (!is_chromeos) { | 285 if (!is_chromeos) { |
| 271 sources += rebase_path(gypi_values.chrome_browser_ui_aura_non_chromeos, | 286 sources += rebase_path(gypi_values.chrome_browser_ui_aura_non_chromeos, |
| 272 ".", "//chrome") | 287 ".", |
| 288 "//chrome") |
| 273 } | 289 } |
| 274 } | 290 } |
| 275 if (ui_compositor_image_transport) { | 291 if (ui_compositor_image_transport) { |
| 276 deps += [ "//ui/gl" ] | 292 deps += [ "//ui/gl" ] |
| 277 } | 293 } |
| 278 if (use_nss_certs) { | 294 if (use_nss_certs) { |
| 279 sources += rebase_path(gypi_values.chrome_browser_ui_nss_sources, | 295 sources += |
| 280 ".", "//chrome") | 296 rebase_path(gypi_values.chrome_browser_ui_nss_sources, ".", "//chrome") |
| 281 } | 297 } |
| 282 if (!enable_themes) { | 298 if (!enable_themes) { |
| 283 sources -= [ "webui/theme_source.cc" ] | 299 sources -= [ "webui/theme_source.cc" ] |
| 284 } | 300 } |
| 285 if (enable_print_preview) { | 301 if (enable_print_preview) { |
| 286 sources += rebase_path(gypi_values.chrome_browser_ui_print_preview_sources, | 302 sources += rebase_path(gypi_values.chrome_browser_ui_print_preview_sources, |
| 287 ".", "//chrome") | 303 ".", |
| 304 "//chrome") |
| 288 } | 305 } |
| 289 if (is_linux || is_android) { | 306 if (is_linux || is_android) { |
| 290 sources += rebase_path(gypi_values.chrome_browser_ui_android_linux_sources, | 307 sources += rebase_path(gypi_values.chrome_browser_ui_android_linux_sources, |
| 291 ".", "//chrome") | 308 ".", |
| 309 "//chrome") |
| 292 } | 310 } |
| 293 | 311 |
| 294 if (is_android) { | 312 if (is_android) { |
| 295 deps += [ | 313 deps += [ |
| 296 "//chrome/browser:jni_headers", | 314 "//chrome/browser:jni_headers", |
| 297 "//crypto:platform", | 315 "//crypto:platform", |
| 316 |
| 298 #'../components/components.gyp:web_contents_delegate_android', TODO(GYP) | 317 #'../components/components.gyp:web_contents_delegate_android', TODO(GYP) |
| 299 ] | 318 ] |
| 300 deps -= [ | 319 deps -= [ |
| 301 "//chrome/browser/ui/views", | 320 "//chrome/browser/ui/views", |
| 302 "//components/feedback/proto", | 321 "//components/feedback/proto", |
| 303 "//third_party/libusb", | 322 "//third_party/libusb", |
| 304 "//ui/events", | 323 "//ui/events", |
| 305 ] | 324 ] |
| 306 sources += rebase_path(gypi_values.chrome_browser_ui_android_sources, | 325 sources += rebase_path(gypi_values.chrome_browser_ui_android_sources, |
| 307 ".", "//chrome") | 326 ".", |
| 327 "//chrome") |
| 308 | 328 |
| 309 defines += [ "CHROME_BUILD_ID=" + android_chrome_build_id ] | 329 defines += [ "CHROME_BUILD_ID=" + android_chrome_build_id ] |
| 310 } else { # Non-Android. | 330 } else { # Non-Android. |
| 311 sources += rebase_path(gypi_values.chrome_browser_ui_non_android_sources, | 331 sources += rebase_path(gypi_values.chrome_browser_ui_non_android_sources, |
| 312 ".", "//chrome") | 332 ".", |
| 333 "//chrome") |
| 313 } | 334 } |
| 314 | 335 |
| 315 if (is_mac) { | 336 if (is_mac) { |
| 316 sources += rebase_path(gypi_values.chrome_browser_ui_mac_sources, | 337 sources += |
| 317 ".", "//chrome") | 338 rebase_path(gypi_values.chrome_browser_ui_mac_sources, ".", "//chrome") |
| 318 sources -= [ | 339 sources -= [ |
| 319 # Mac has its own way of drawing tabs. | 340 # Mac has its own way of drawing tabs. |
| 320 "tabs/tab_resources.cc", | 341 "tabs/tab_resources.cc", |
| 321 "tabs/tab_resources.h", | 342 "tabs/tab_resources.h", |
| 322 ] | 343 ] |
| 323 deps += [ | 344 deps += [ |
| 324 "//third_party/google_toolbox_for_mac", | 345 "//third_party/google_toolbox_for_mac", |
| 325 ":generate_localizer", | 346 ":generate_localizer", |
| 347 |
| 326 #'../third_party/apple_sample_code/apple_sample_code.gyp:apple_sample_code
', TODO(GYP) | 348 #'../third_party/apple_sample_code/apple_sample_code.gyp:apple_sample_code
', TODO(GYP) |
| 327 #'../third_party/molokocacao/molokocacao.gyp:molokocacao', TODO(GYP) | 349 #'../third_party/molokocacao/molokocacao.gyp:molokocacao', TODO(GYP) |
| 328 #'../third_party/mozilla/mozilla.gyp:mozilla', TODO(GYP) | 350 #'../third_party/mozilla/mozilla.gyp:mozilla', TODO(GYP) |
| 329 ] | 351 ] |
| 330 include_dirs = [ "$target_gen_dir" ] | 352 include_dirs = [ "$target_gen_dir" ] |
| 331 libs += [ "Quartz.framework" ] | 353 libs += [ "Quartz.framework" ] |
| 332 configs += [ | 354 configs += |
| 333 "//third_party/google_toolbox_for_mac:google_toolbox_for_mac_config", | 355 [ "//third_party/google_toolbox_for_mac:google_toolbox_for_mac_config" ] |
| 334 ] | |
| 335 } else { # non-Mac. | 356 } else { # non-Mac. |
| 336 sources += rebase_path(gypi_values.chrome_browser_ui_non_mac_sources, | 357 sources += rebase_path(gypi_values.chrome_browser_ui_non_mac_sources, |
| 337 ".", "//chrome") | 358 ".", |
| 359 "//chrome") |
| 338 } | 360 } |
| 339 | 361 |
| 340 if (is_win) { | 362 if (is_win) { |
| 341 sources += rebase_path(gypi_values.chrome_browser_ui_win_sources, | 363 sources += |
| 342 ".", "//chrome") | 364 rebase_path(gypi_values.chrome_browser_ui_win_sources, ".", "//chrome") |
| 343 public_deps += [ | 365 public_deps += [ |
| 344 "//ui/views", | 366 "//ui/views", |
| 345 "//ui/views/controls/webview", | 367 "//ui/views/controls/webview", |
| 346 ] | 368 ] |
| 347 deps += [ | 369 deps += [ |
| 348 "//chrome/installer/util:strings", | 370 "//chrome/installer/util:strings", |
| 349 "//third_party/wtl", | 371 "//third_party/wtl", |
| 350 "//third_party/iaccessible2", | 372 "//third_party/iaccessible2", |
| 351 "//third_party/isimpledom", | 373 "//third_party/isimpledom", |
| 352 "//ui/app_list", | 374 "//ui/app_list", |
| 375 |
| 353 #'metro_utils', TODO(GYP) | 376 #'metro_utils', TODO(GYP) |
| 354 #'../google_update/google_update.gyp:google_update', TODO(GYP) | 377 #'../google_update/google_update.gyp:google_update', TODO(GYP) |
| 355 ] | 378 ] |
| 356 } else { # 'OS!="win" | 379 } else { # 'OS!="win" |
| 357 if (toolkit_views) { | 380 if (toolkit_views) { |
| 358 public_deps += [ | 381 public_deps += [ |
| 359 "//ui/views", | 382 "//ui/views", |
| 360 "//ui/views/controls/webview", | 383 "//ui/views/controls/webview", |
| 361 ] | 384 ] |
| 362 } | 385 } |
| 363 } | 386 } |
| 364 if (is_desktop_linux) { | 387 if (is_desktop_linux) { |
| 365 sources += rebase_path(gypi_values.chrome_browser_ui_desktop_linux_sources, | 388 sources += rebase_path(gypi_values.chrome_browser_ui_desktop_linux_sources, |
| 366 ".", "//chrome") | 389 ".", |
| 390 "//chrome") |
| 367 } | 391 } |
| 368 if (is_linux) { # Both desktop Linux and ChromeOS. | 392 if (is_linux) { # Both desktop Linux and ChromeOS. |
| 369 sources += rebase_path(gypi_values.chrome_browser_ui_linux_sources, | 393 sources += rebase_path(gypi_values.chrome_browser_ui_linux_sources, |
| 370 ".", "//chrome") | 394 ".", |
| 395 "//chrome") |
| 371 deps += [ "//device/udev_linux" ] | 396 deps += [ "//device/udev_linux" ] |
| 372 if (use_aura) { | 397 if (use_aura) { |
| 373 configs += [ "//build/config/linux:fontconfig" ] | 398 configs += [ "//build/config/linux:fontconfig" ] |
| 374 deps += [ "//dbus" ] | 399 deps += [ "//dbus" ] |
| 375 } | 400 } |
| 376 if (use_x11) { | 401 if (use_x11) { |
| 377 sources += rebase_path(gypi_values.chrome_browser_ui_x11_sources, | 402 sources += rebase_path(gypi_values.chrome_browser_ui_x11_sources, |
| 378 ".", "//chrome") | 403 ".", |
| 404 "//chrome") |
| 379 configs += [ "//build/config/linux:x11" ] | 405 configs += [ "//build/config/linux:x11" ] |
| 380 deps += [ "//ui/events/devices" ] | 406 deps += [ "//ui/events/devices" ] |
| 381 if (is_chromeos) { | 407 if (is_chromeos) { |
| 382 sources -= [ "views/tabs/window_finder_x11.cc" ] | 408 sources -= [ "views/tabs/window_finder_x11.cc" ] |
| 383 } | 409 } |
| 384 } | 410 } |
| 385 } | 411 } |
| 386 | 412 |
| 387 if (enable_app_list) { | 413 if (enable_app_list) { |
| 388 sources += rebase_path(gypi_values.chrome_browser_ui_app_list_sources, | 414 sources += rebase_path(gypi_values.chrome_browser_ui_app_list_sources, |
| 389 ".", "//chrome") | 415 ".", |
| 416 "//chrome") |
| 390 deps += [ "//ui/app_list" ] | 417 deps += [ "//ui/app_list" ] |
| 391 } else { | 418 } else { |
| 392 sources += rebase_path(gypi_values.chrome_browser_ui_non_app_list_sources, | 419 sources += rebase_path(gypi_values.chrome_browser_ui_non_app_list_sources, |
| 393 ".", "//chrome") | 420 ".", |
| 421 "//chrome") |
| 394 } | 422 } |
| 395 if (enable_autofill_dialog) { | 423 if (enable_autofill_dialog) { |
| 396 sources += rebase_path( | 424 sources += |
| 397 gypi_values.chrome_browser_ui_autofill_dialog_sources, | 425 rebase_path(gypi_values.chrome_browser_ui_autofill_dialog_sources, |
| 398 ".", "//chrome") | 426 ".", |
| 427 "//chrome") |
| 399 if (!is_android && !is_ios) { | 428 if (!is_android && !is_ios) { |
| 400 sources += rebase_path( | 429 sources += rebase_path( |
| 401 gypi_values.chrome_browser_ui_autofill_dialog_non_mobile_sources, | 430 gypi_values.chrome_browser_ui_autofill_dialog_non_mobile_sources, |
| 402 ".", "//chrome") | 431 ".", |
| 432 "//chrome") |
| 403 deps += [ | 433 deps += [ |
| 404 "//third_party/libaddressinput", | 434 "//third_party/libaddressinput", |
| 405 "//third_party/libaddressinput:strings", | 435 "//third_party/libaddressinput:strings", |
| 406 ] | 436 ] |
| 407 } | 437 } |
| 408 } | 438 } |
| 409 if (enable_extensions) { | 439 if (enable_extensions) { |
| 410 deps += [ | 440 deps += [ |
| 411 "//chrome/browser/extensions", | 441 "//chrome/browser/extensions", |
| 412 "//chrome/common/extensions/api", | 442 "//chrome/common/extensions/api", |
| 413 "//chrome/common/extensions/api:api_registration", | 443 "//chrome/common/extensions/api:api_registration", |
| 414 ] | 444 ] |
| 415 sources += rebase_path(gypi_values.chrome_browser_ui_extensions_sources, | 445 sources += rebase_path(gypi_values.chrome_browser_ui_extensions_sources, |
| 416 ".", "//chrome") | 446 ".", |
| 447 "//chrome") |
| 417 } | 448 } |
| 418 if (enable_google_now && !is_android) { | 449 if (enable_google_now && !is_android) { |
| 419 sources += rebase_path( | 450 sources += rebase_path( |
| 420 gypi_values.chrome_browser_ui_google_now_non_android_sources, | 451 gypi_values.chrome_browser_ui_google_now_non_android_sources, |
| 421 ".", "//chrome") | 452 ".", |
| 453 "//chrome") |
| 422 } | 454 } |
| 423 if (enable_webrtc) { | 455 if (enable_webrtc) { |
| 424 sources += rebase_path(gypi_values.chrome_browser_ui_webrtc_sources, | 456 sources += rebase_path(gypi_values.chrome_browser_ui_webrtc_sources, |
| 425 ".", "//chrome") | 457 ".", |
| 458 "//chrome") |
| 426 } | 459 } |
| 427 if (enable_service_discovery) { | 460 if (enable_service_discovery) { |
| 428 sources += rebase_path( | 461 sources += |
| 429 gypi_values.chrome_browser_ui_service_discovery_sources, | 462 rebase_path(gypi_values.chrome_browser_ui_service_discovery_sources, |
| 430 ".", "//chrome") | 463 ".", |
| 464 "//chrome") |
| 431 } | 465 } |
| 432 if (enable_spellcheck) { | 466 if (enable_spellcheck) { |
| 433 deps += [ "//third_party/hunspell" ] | 467 deps += [ "//third_party/hunspell" ] |
| 434 } | 468 } |
| 435 } | 469 } |
| 436 | 470 |
| 437 if (is_mac) { | 471 if (is_mac) { |
| 438 nib_gypi_values = exec_script( | 472 nib_gypi_values = exec_script("//build/gypi_to_gn.py", |
| 439 "//build/gypi_to_gn.py", | 473 [ rebase_path("../../chrome_nibs.gypi") ], |
| 440 [ rebase_path("../../chrome_nibs.gypi") ], | 474 "scope", |
| 441 "scope", | 475 [ "../../chrome_nibs.gypi" ]) |
| 442 [ "../../chrome_nibs.gypi" ]) | |
| 443 | 476 |
| 444 action("generate_localizer") { | 477 action("generate_localizer") { |
| 445 script = "//chrome/tools/build/mac/generate_localizer" | 478 script = "//chrome/tools/build/mac/generate_localizer" |
| 446 sources = [ ] | 479 sources = [] |
| 447 table_path = "$target_gen_dir/ui_localizer_table.h" | 480 table_path = "$target_gen_dir/ui_localizer_table.h" |
| 448 outputs = [ table_path ] | 481 outputs = [ |
| 482 table_path, |
| 483 ] |
| 449 args = [ rebase_path(table_path, root_build_dir) ] + | 484 args = [ rebase_path(table_path, root_build_dir) ] + |
| 450 rebase_path(nib_gypi_values.mac_translated_xibs, | 485 rebase_path(nib_gypi_values.mac_translated_xibs, |
| 451 root_build_dir, | 486 root_build_dir, |
| 452 "//chrome") | 487 "//chrome") |
| 453 } | 488 } |
| 454 } | 489 } |
| 455 | 490 |
| 456 # In GYP this is part of test_support_common. | 491 # In GYP this is part of test_support_common. |
| 457 source_set("test_support") { | 492 source_set("test_support") { |
| 458 testonly = true | 493 testonly = true |
| 459 | 494 |
| 460 sources = [ | 495 sources = [ |
| 461 "browser.h", | 496 "browser.h", |
| 462 "cocoa/find_bar/find_bar_host_unittest_util_cocoa.mm", | 497 "cocoa/find_bar/find_bar_host_unittest_util_cocoa.mm", |
| (...skipping 11 matching lines...) Expand all Loading... |
| 474 "passwords/manage_passwords_ui_controller_mock.h", | 509 "passwords/manage_passwords_ui_controller_mock.h", |
| 475 "pdf/pdf_browsertest_base.cc", | 510 "pdf/pdf_browsertest_base.cc", |
| 476 "pdf/pdf_browsertest_base.h", | 511 "pdf/pdf_browsertest_base.h", |
| 477 "test/test_confirm_bubble_model.cc", | 512 "test/test_confirm_bubble_model.cc", |
| 478 "test/test_confirm_bubble_model.h", | 513 "test/test_confirm_bubble_model.h", |
| 479 "website_settings/mock_permission_bubble_request.cc", | 514 "website_settings/mock_permission_bubble_request.cc", |
| 480 "website_settings/mock_permission_bubble_request.h", | 515 "website_settings/mock_permission_bubble_request.h", |
| 481 ] | 516 ] |
| 482 | 517 |
| 483 if (toolkit_views) { | 518 if (toolkit_views) { |
| 484 sources += [ | 519 sources += [ "views/find_bar_host_unittest_util_views.cc" ] |
| 485 "views/find_bar_host_unittest_util_views.cc", | |
| 486 ] | |
| 487 } | 520 } |
| 488 | 521 |
| 489 public_deps = [ | 522 public_deps = [ |
| 490 ":ui", | 523 ":ui", |
| 491 ] | 524 ] |
| 492 deps = [ | 525 deps = [ |
| 493 "//chrome/app/theme:theme_resources", | 526 "//chrome/app/theme:theme_resources", |
| 494 "//chrome/browser", | 527 "//chrome/browser", |
| 495 "//content/public/browser", | 528 "//content/public/browser", |
| 496 "//content/public/common", | 529 "//content/public/common", |
| 497 "//content/test:test_support", | 530 "//content/test:test_support", |
| 498 "//net:test_support", | 531 "//net:test_support", |
| 499 "//skia", | 532 "//skia", |
| 500 "//testing/gtest", | 533 "//testing/gtest", |
| 501 "//ui/base", | 534 "//ui/base", |
| 502 ] | 535 ] |
| 503 } | 536 } |
| OLD | NEW |