| 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") | 
| 11 import("//extensions/features/features.gni") | 11 import("//extensions/features/features.gni") | 
| 12 import("//media/media_options.gni") | 12 import("//media/media_options.gni") | 
| 13 import("//ppapi/features/features.gni") | 13 import("//ppapi/features/features.gni") | 
| 14 import("//printing/features/features.gni") | 14 import("//printing/features/features.gni") | 
|  | 15 import("//ui/base/ui_features.gni") | 
| 15 | 16 | 
| 16 config("ui_warnings") { | 17 config("ui_warnings") { | 
| 17   if (is_clang) { | 18   if (is_clang) { | 
| 18     # TODO(thakis): Remove this once http://crbug.com/383820 is figured out | 19     # TODO(thakis): Remove this once http://crbug.com/383820 is figured out | 
| 19     cflags = [ "-Wno-nonnull" ] | 20     cflags = [ "-Wno-nonnull" ] | 
| 20   } | 21   } | 
| 21 } | 22 } | 
| 22 | 23 | 
| 23 # Use a static library here because many test binaries depend on this but don't | 24 # Use a static library here because many test binaries depend on this but don't | 
| 24 # require many files from it. This makes linking more efficient. | 25 # require many files from it. This makes linking more efficient. | 
| (...skipping 3455 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 3480       "test/test_confirm_bubble_model.cc", | 3481       "test/test_confirm_bubble_model.cc", | 
| 3481       "test/test_confirm_bubble_model.h", | 3482       "test/test_confirm_bubble_model.h", | 
| 3482     ] | 3483     ] | 
| 3483     deps += [ "//chrome/test:test_support_ui" ] | 3484     deps += [ "//chrome/test:test_support_ui" ] | 
| 3484   } | 3485   } | 
| 3485 | 3486 | 
| 3486   if (enable_extensions) { | 3487   if (enable_extensions) { | 
| 3487     deps += [ "//extensions/browser" ] | 3488     deps += [ "//extensions/browser" ] | 
| 3488   } | 3489   } | 
| 3489 } | 3490 } | 
| OLD | NEW | 
|---|