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

Side by Side Diff: chrome/chrome_browser_ui.gypi

Issue 2026973002: Moves ash/wm/common/resources back to ash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: delete revived file Created 4 years, 6 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 | « chrome/chrome_browser_chromeos.gypi ('k') | chrome/chrome_repack_chrome_100_percent.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 2012 The Chromium Authors. All rights reserved. 1 # Copyright 2012 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 # There are two sections of sources: 7 # There are two sections of sources:
8 # * "Platform"-based sources (OS, toolkit, etc.) 8 # * "Platform"-based sources (OS, toolkit, etc.)
9 # * Feature/directory-based sources (e.g., history, printing) 9 # * Feature/directory-based sources (e.g., history, printing)
10 10
(...skipping 3043 matching lines...) Expand 10 before | Expand all | Expand 10 after
3054 ], 3054 ],
3055 }], 3055 }],
3056 ['OS=="win" or OS=="mac" or desktop_linux==1', { 3056 ['OS=="win" or OS=="mac" or desktop_linux==1', {
3057 'sources': [ '<@(chrome_browser_ui_desktop_sources)' ], 3057 'sources': [ '<@(chrome_browser_ui_desktop_sources)' ],
3058 }], 3058 }],
3059 ['use_aura==1', { 3059 ['use_aura==1', {
3060 'sources': [ '<@(chrome_browser_ui_aura_sources)'] , 3060 'sources': [ '<@(chrome_browser_ui_aura_sources)'] ,
3061 'dependencies': [ 3061 'dependencies': [
3062 # aura uses some of ash resources. 3062 # aura uses some of ash resources.
3063 '../ash/ash_resources.gyp:ash_resources', 3063 '../ash/ash_resources.gyp:ash_resources',
3064 '../ash/wm/common/ash_wm_common_resources.gyp:ash_wm_common_resource s',
3065 '../ui/aura/aura.gyp:aura', 3064 '../ui/aura/aura.gyp:aura',
3066 '../ui/keyboard/keyboard.gyp:keyboard', 3065 '../ui/keyboard/keyboard.gyp:keyboard',
3067 '../ui/keyboard/keyboard.gyp:keyboard_with_content', 3066 '../ui/keyboard/keyboard.gyp:keyboard_with_content',
3068 '../ui/keyboard/keyboard.gyp:keyboard_resources', 3067 '../ui/keyboard/keyboard.gyp:keyboard_resources',
3069 '../ui/wm/wm.gyp:wm', 3068 '../ui/wm/wm.gyp:wm',
3070 ], 3069 ],
3071 'conditions': [ 3070 'conditions': [
3072 ['chromeos == 0', { 3071 ['chromeos == 0', {
3073 'sources': [ '<@(chrome_browser_ui_aura_non_chromeos)' ], 3072 'sources': [ '<@(chrome_browser_ui_aura_non_chromeos)' ],
3074 }], 3073 }],
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
3338 ], 3337 ],
3339 'sources': [ 3338 'sources': [
3340 '<@(chrome_browser_ui_non_mobile_sources)', 3339 '<@(chrome_browser_ui_non_mobile_sources)',
3341 '<@(chrome_browser_ui_omnibox_non_mobile_sources)', 3340 '<@(chrome_browser_ui_omnibox_non_mobile_sources)',
3342 ], 3341 ],
3343 }], 3342 }],
3344 ], 3343 ],
3345 }, 3344 },
3346 ], 3345 ],
3347 } 3346 }
OLDNEW
« no previous file with comments | « chrome/chrome_browser_chromeos.gypi ('k') | chrome/chrome_repack_chrome_100_percent.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698