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

Side by Side Diff: ash/ash.gyp

Issue 14077010: Move ash tray audio UI code from ash/system/audio to ash/system/chromeos/audio. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Make audio code CHROMROS only in SystemTrayNotifier. Created 7 years, 8 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/system/audio/audio_observer.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 'includes': [ 10 'includes': [
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 'shelf/shelf_layout_manager.cc', 168 'shelf/shelf_layout_manager.cc',
169 'shelf/shelf_layout_manager.h', 169 'shelf/shelf_layout_manager.h',
170 'shelf/shelf_types.h', 170 'shelf/shelf_types.h',
171 'shelf/shelf_widget.cc', 171 'shelf/shelf_widget.cc',
172 'shelf/shelf_widget.h', 172 'shelf/shelf_widget.h',
173 'shell.cc', 173 'shell.cc',
174 'shell.h', 174 'shell.h',
175 'shell_delegate.h', 175 'shell_delegate.h',
176 'shell_factory.h', 176 'shell_factory.h',
177 'shell_window_ids.h', 177 'shell_window_ids.h',
178 'system/audio/audio_observer.h',
179 'system/audio/tray_volume.cc',
180 'system/audio/tray_volume.h',
181 'system/bluetooth/bluetooth_observer.h', 178 'system/bluetooth/bluetooth_observer.h',
182 'system/bluetooth/tray_bluetooth.cc', 179 'system/bluetooth/tray_bluetooth.cc',
183 'system/bluetooth/tray_bluetooth.h', 180 'system/bluetooth/tray_bluetooth.h',
184 'system/brightness/brightness_observer.h', 181 'system/brightness/brightness_observer.h',
185 'system/brightness/brightness_control_delegate.h', 182 'system/brightness/brightness_control_delegate.h',
186 'system/brightness/tray_brightness.cc', 183 'system/brightness/tray_brightness.cc',
187 'system/brightness/tray_brightness.h', 184 'system/brightness/tray_brightness.h',
185 'system/chromeos/audio/audio_observer.h',
186 'system/chromeos/audio/tray_volume.cc',
187 'system/chromeos/audio/tray_volume.h',
188 'system/chromeos/enterprise/enterprise_domain_observer.h', 188 'system/chromeos/enterprise/enterprise_domain_observer.h',
189 'system/chromeos/enterprise/tray_enterprise.h', 189 'system/chromeos/enterprise/tray_enterprise.h',
190 'system/chromeos/enterprise/tray_enterprise.cc', 190 'system/chromeos/enterprise/tray_enterprise.cc',
191 'system/chromeos/keyboard_brightness_controller.cc', 191 'system/chromeos/keyboard_brightness_controller.cc',
192 'system/chromeos/keyboard_brightness_controller.h', 192 'system/chromeos/keyboard_brightness_controller.h',
193 'system/chromeos/network/network_detailed_view.h', 193 'system/chromeos/network/network_detailed_view.h',
194 'system/chromeos/network/network_icon.cc', 194 'system/chromeos/network/network_icon.cc',
195 'system/chromeos/network/network_icon.h', 195 'system/chromeos/network/network_icon.h',
196 'system/chromeos/network/network_icon_animation.cc', 196 'system/chromeos/network/network_icon_animation.cc',
197 'system/chromeos/network/network_icon_animation.h', 197 'system/chromeos/network/network_icon_animation.h',
(...skipping 627 matching lines...) Expand 10 before | Expand all | Expand 10 after
825 'shell/cocoa/app-Info.plist', 825 'shell/cocoa/app-Info.plist',
826 ], 826 ],
827 'xcode_settings': { 827 'xcode_settings': {
828 'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist', 828 'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist',
829 }, 829 },
830 }], 830 }],
831 ], 831 ],
832 }, 832 },
833 ], 833 ],
834 } 834 }
OLDNEW
« no previous file with comments | « no previous file | ash/system/audio/audio_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698