| 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/chrome_build.gni") | 5 import("//build/config/chrome_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 2219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2230 | 2230 |
| 2231 if (use_x11) { | 2231 if (use_x11) { |
| 2232 sources += [ | 2232 sources += [ |
| 2233 "chrome_browser_main_extra_parts_x11.cc", | 2233 "chrome_browser_main_extra_parts_x11.cc", |
| 2234 "chrome_browser_main_extra_parts_x11.h", | 2234 "chrome_browser_main_extra_parts_x11.h", |
| 2235 "password_manager/password_store_x.cc", | 2235 "password_manager/password_store_x.cc", |
| 2236 "password_manager/password_store_x.h", | 2236 "password_manager/password_store_x.h", |
| 2237 ] | 2237 ] |
| 2238 } | 2238 } |
| 2239 if (use_aura && !use_ozone && is_desktop_linux) { | 2239 if (use_aura && !use_ozone && is_desktop_linux) { |
| 2240 deps += [ "//chrome/browser/ui/libgtk2ui" ] | 2240 if (use_gtk3) { |
| 2241 allow_circular_includes_from += [ "//chrome/browser/ui/libgtk2ui" ] | 2241 deps += [ "//chrome/browser/ui/libgtk2ui:libgtk3ui" ] |
| 2242 } else { |
| 2243 deps += [ "//chrome/browser/ui/libgtk2ui:libgtk2ui" ] |
| 2244 } |
| 2242 } | 2245 } |
| 2243 if (is_posix && !is_mac) { | 2246 if (is_posix && !is_mac) { |
| 2244 sources += [ | 2247 sources += [ |
| 2245 "//chrome/app/chrome_crash_reporter_client.cc", | 2248 "//chrome/app/chrome_crash_reporter_client.cc", |
| 2246 "//chrome/app/chrome_crash_reporter_client.h", | 2249 "//chrome/app/chrome_crash_reporter_client.h", |
| 2247 ] | 2250 ] |
| 2248 deps += [ | 2251 deps += [ |
| 2249 "//components/crash/content/app", | 2252 "//components/crash/content/app", |
| 2250 "//components/crash/content/browser", | 2253 "//components/crash/content/browser", |
| 2251 "//components/version_info:generate_version_info", | 2254 "//components/version_info:generate_version_info", |
| (...skipping 2077 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4329 # linking all of the test support. | 4332 # linking all of the test support. |
| 4330 static_library("pepper_cdm_test_constants") { | 4333 static_library("pepper_cdm_test_constants") { |
| 4331 testonly = true | 4334 testonly = true |
| 4332 visibility = [ "//chrome/*" ] | 4335 visibility = [ "//chrome/*" ] |
| 4333 sources = [ | 4336 sources = [ |
| 4334 "media/pepper_cdm_test_constants.cc", | 4337 "media/pepper_cdm_test_constants.cc", |
| 4335 "media/pepper_cdm_test_constants.h", | 4338 "media/pepper_cdm_test_constants.h", |
| 4336 ] | 4339 ] |
| 4337 } | 4340 } |
| 4338 } | 4341 } |
| OLD | NEW |