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

Side by Side Diff: chrome/chrome_common.gypi

Issue 924063003: [Favicon] Adding FallbackIconUrlParser. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync, to include the fix from https://codereview.chromium.org/971623003 . Created 5 years, 9 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/chrome_tests_unit.gypi » ('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 (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 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 { 5 {
6 'variables': { 6 'variables': {
7 # File lists shared with GN build. 7 # File lists shared with GN build.
8 'chrome_common_sources': [ 8 'chrome_common_sources': [
9 'common/all_messages.h', 9 'common/all_messages.h',
10 'common/attrition_experiments.h', 10 'common/attrition_experiments.h',
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 'common/common_param_traits.h', 44 'common/common_param_traits.h',
45 'common/common_param_traits_macros.h', 45 'common/common_param_traits_macros.h',
46 'common/content_restriction.h', 46 'common/content_restriction.h',
47 'common/content_settings_pattern_serializer.cc', 47 'common/content_settings_pattern_serializer.cc',
48 'common/content_settings_pattern_serializer.h', 48 'common/content_settings_pattern_serializer.h',
49 'common/crash_keys.cc', 49 'common/crash_keys.cc',
50 'common/crash_keys.h', 50 'common/crash_keys.h',
51 'common/custom_handlers/protocol_handler.cc', 51 'common/custom_handlers/protocol_handler.cc',
52 'common/custom_handlers/protocol_handler.h', 52 'common/custom_handlers/protocol_handler.h',
53 'common/descriptors_android.h', 53 'common/descriptors_android.h',
54 'common/favicon/fallback_icon_url_parser.cc',
55 'common/favicon/fallback_icon_url_parser.h',
54 'common/favicon/favicon_url_parser.cc', 56 'common/favicon/favicon_url_parser.cc',
55 'common/favicon/favicon_url_parser.h', 57 'common/favicon/favicon_url_parser.h',
56 'common/icon_with_badge_image_source.cc', 58 'common/icon_with_badge_image_source.cc',
57 'common/icon_with_badge_image_source.h', 59 'common/icon_with_badge_image_source.h',
58 'common/ini_parser.cc', 60 'common/ini_parser.cc',
59 'common/ini_parser.h', 61 'common/ini_parser.h',
60 'common/instant_types.cc', 62 'common/instant_types.cc',
61 'common/instant_types.h', 63 'common/instant_types.h',
62 'common/localized_error.cc', 64 'common/localized_error.cc',
63 'common/localized_error.h', 65 'common/localized_error.h',
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
310 '<(DEPTH)/components/components.gyp:favicon_base', 312 '<(DEPTH)/components/components.gyp:favicon_base',
311 '<(DEPTH)/components/components.gyp:json_schema', 313 '<(DEPTH)/components/components.gyp:json_schema',
312 '<(DEPTH)/components/components.gyp:metrics', 314 '<(DEPTH)/components/components.gyp:metrics',
313 '<(DEPTH)/components/components.gyp:policy_component_common', 315 '<(DEPTH)/components/components.gyp:policy_component_common',
314 '<(DEPTH)/components/components.gyp:translate_core_common', 316 '<(DEPTH)/components/components.gyp:translate_core_common',
315 '<(DEPTH)/components/components.gyp:variations', 317 '<(DEPTH)/components/components.gyp:variations',
316 '<(DEPTH)/content/content.gyp:content_common', 318 '<(DEPTH)/content/content.gyp:content_common',
317 '<(DEPTH)/crypto/crypto.gyp:crypto', 319 '<(DEPTH)/crypto/crypto.gyp:crypto',
318 '<(DEPTH)/net/net.gyp:net', 320 '<(DEPTH)/net/net.gyp:net',
319 '<(DEPTH)/skia/skia.gyp:skia', 321 '<(DEPTH)/skia/skia.gyp:skia',
322 '<(DEPTH)/skia/skia.gyp:skia_library',
320 '<(DEPTH)/third_party/icu/icu.gyp:icui18n', 323 '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
321 '<(DEPTH)/third_party/icu/icu.gyp:icuuc', 324 '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
322 '<(DEPTH)/third_party/libxml/libxml.gyp:libxml', 325 '<(DEPTH)/third_party/libxml/libxml.gyp:libxml',
323 '<(DEPTH)/third_party/sqlite/sqlite.gyp:sqlite', 326 '<(DEPTH)/third_party/sqlite/sqlite.gyp:sqlite',
324 '<(DEPTH)/third_party/zlib/google/zip.gyp:zip', 327 '<(DEPTH)/third_party/zlib/google/zip.gyp:zip',
325 '<(DEPTH)/ui/gfx/ipc/gfx_ipc.gyp:gfx_ipc', 328 '<(DEPTH)/ui/gfx/ipc/gfx_ipc.gyp:gfx_ipc',
326 '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources', 329 '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources',
327 '<(DEPTH)/url/url.gyp:url_lib', 330 '<(DEPTH)/url/url.gyp:url_lib',
328 ], 331 ],
329 'sources': [ 332 'sources': [
(...skipping 341 matching lines...) Expand 10 before | Expand all | Expand 10 after
671 'common/safe_browsing/csd.proto' 674 'common/safe_browsing/csd.proto'
672 ], 675 ],
673 'variables': { 676 'variables': {
674 'proto_in_dir': 'common/safe_browsing', 677 'proto_in_dir': 'common/safe_browsing',
675 'proto_out_dir': 'chrome/common/safe_browsing', 678 'proto_out_dir': 'chrome/common/safe_browsing',
676 }, 679 },
677 'includes': [ '../build/protoc.gypi' ], 680 'includes': [ '../build/protoc.gypi' ],
678 }, 681 },
679 ], 682 ],
680 } 683 }
OLDNEW
« no previous file with comments | « no previous file | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698