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

Side by Side Diff: chrome/chrome.gyp

Issue 7663001: Make bubble_border use resources under ui/resources. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Merge Created 9 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/views/bubble/bubble_border.cc ('k') | chrome/chrome_browser.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) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 'variables': { 5 'variables': {
6 'chromium_code': 1, 6 'chromium_code': 1,
7 7
8 'variables': { 8 'variables': {
9 'version_py_path': 'tools/build/version.py', 9 'version_py_path': 'tools/build/version.py',
10 'version_path': 'VERSION', 10 'version_path': 'VERSION',
(...skipping 1632 matching lines...) Expand 10 before | Expand all | Expand 10 after
1643 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak', 1643 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
1644 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.pak', 1644 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.pak',
1645 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.pak', 1645 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.pak',
1646 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak ', 1646 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak ',
1647 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak', 1647 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak',
1648 ], 1648 ],
1649 'conditions': [ 1649 'conditions': [
1650 ['touchui==0', { 1650 ['touchui==0', {
1651 'pak_inputs': [ 1651 'pak_inputs': [
1652 '<(grit_out_dir)/theme_resources_standard.pak', 1652 '<(grit_out_dir)/theme_resources_standard.pak',
1653 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_reso urces_standard.pak',
1653 ], 1654 ],
1654 }, { # else: touchui!=0 1655 }, { # else: touchui!=0
1655 'pak_inputs': [ 1656 'pak_inputs': [
1656 '<(grit_out_dir)/theme_resources_large.pak', 1657 '<(grit_out_dir)/theme_resources_large.pak',
1658 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_large/ui_resourc es_large.pak',
1657 ], 1659 ],
1658 }], 1660 }],
1659 ], 1661 ],
1660 }, 1662 },
1661 'inputs': [ 1663 'inputs': [
1662 '<(repack_path)', 1664 '<(repack_path)',
1663 '<@(pak_inputs)', 1665 '<@(pak_inputs)',
1664 ], 1666 ],
1665 'outputs': [ 1667 'outputs': [
1666 '<(INTERMEDIATE_DIR)/repack/chrome.pak', 1668 '<(INTERMEDIATE_DIR)/repack/chrome.pak',
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
1708 'destination': '<(PRODUCT_DIR)', 1710 'destination': '<(PRODUCT_DIR)',
1709 'files': [ 1711 'files': [
1710 '<(INTERMEDIATE_DIR)/repack/chrome.pak' 1712 '<(INTERMEDIATE_DIR)/repack/chrome.pak'
1711 ], 1713 ],
1712 }, 1714 },
1713 ], 1715 ],
1714 }], # targets 1716 }], # targets
1715 }], # OS != "mac" 1717 }], # OS != "mac"
1716 ], # 'conditions' 1718 ], # 'conditions'
1717 } 1719 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/bubble/bubble_border.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698