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

Side by Side Diff: ash/ash.gyp

Issue 10383223: Revert 137549 because it broke win_aura and linux_chromeos_clang compile. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 7 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 | « no previous file | ash/ash_switches.h » ('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) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 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 'chromium_code': 1, 7 'chromium_code': 1,
8 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', 8 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
9 }, 9 },
10 10
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 'system/tray_caps_lock.h', 170 'system/tray_caps_lock.h',
171 'system/tray_update.cc', 171 'system/tray_update.cc',
172 'system/tray_update.h', 172 'system/tray_update.h',
173 'system/user/login_status.h', 173 'system/user/login_status.h',
174 'system/user/tray_user.cc', 174 'system/user/tray_user.cc',
175 'system/user/tray_user.h', 175 'system/user/tray_user.h',
176 'system/user/update_observer.h', 176 'system/user/update_observer.h',
177 'system/user/user_observer.h', 177 'system/user/user_observer.h',
178 'tooltips/tooltip_controller.cc', 178 'tooltips/tooltip_controller.cc',
179 'tooltips/tooltip_controller.h', 179 'tooltips/tooltip_controller.h',
180 'touch/touch_observer_hud.cc',
181 'touch/touch_observer_hud.h',
182 'volume_control_delegate.h', 180 'volume_control_delegate.h',
183 'wm/app_list_controller.cc', 181 'wm/app_list_controller.cc',
184 'wm/app_list_controller.h', 182 'wm/app_list_controller.h',
185 'wm/activation_controller.cc', 183 'wm/activation_controller.cc',
186 'wm/activation_controller.h', 184 'wm/activation_controller.h',
187 'wm/always_on_top_controller.cc', 185 'wm/always_on_top_controller.cc',
188 'wm/always_on_top_controller.h', 186 'wm/always_on_top_controller.h',
189 'wm/base_layout_manager.cc', 187 'wm/base_layout_manager.cc',
190 'wm/base_layout_manager.h', 188 'wm/base_layout_manager.h',
191 'wm/custom_frame_view_ash.cc', 189 'wm/custom_frame_view_ash.cc',
(...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after
524 'shell/cocoa/app-Info.plist', 522 'shell/cocoa/app-Info.plist',
525 ], 523 ],
526 'xcode_settings': { 524 'xcode_settings': {
527 'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist', 525 'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist',
528 }, 526 },
529 }], 527 }],
530 ], 528 ],
531 }, 529 },
532 ], 530 ],
533 } 531 }
OLDNEW
« no previous file with comments | « no previous file | ash/ash_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698