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

Side by Side Diff: ash/BUILD.gn

Issue 2483393002: chromeos: Combine TrayAudio and TrayAudioChromeOs classes (Closed)
Patch Set: rebase Created 4 years, 1 month 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 | ash/common/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 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 import("//build/config/features.gni") 5 import("//build/config/features.gni")
6 import("//build/config/ui.gni") 6 import("//build/config/ui.gni")
7 import("//testing/test.gni") 7 import("//testing/test.gni")
8 import("//ui/base/ui_features.gni") 8 import("//ui/base/ui_features.gni")
9 9
10 assert(use_aura) 10 assert(use_aura)
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 "common/shelf/shelf_window_watcher.h", 181 "common/shelf/shelf_window_watcher.h",
182 "common/shelf/shelf_window_watcher_item_delegate.cc", 182 "common/shelf/shelf_window_watcher_item_delegate.cc",
183 "common/shelf/shelf_window_watcher_item_delegate.h", 183 "common/shelf/shelf_window_watcher_item_delegate.h",
184 "common/shelf/wm_shelf.cc", 184 "common/shelf/wm_shelf.cc",
185 "common/shelf/wm_shelf.h", 185 "common/shelf/wm_shelf.h",
186 "common/shelf/wm_shelf_observer.h", 186 "common/shelf/wm_shelf_observer.h",
187 "common/shelf/wm_shelf_util.cc", 187 "common/shelf/wm_shelf_util.cc",
188 "common/shelf/wm_shelf_util.h", 188 "common/shelf/wm_shelf_util.h",
189 "common/shell_delegate.h", 189 "common/shell_delegate.h",
190 "common/system/accessibility_observer.h", 190 "common/system/accessibility_observer.h",
191 "common/system/audio/audio_observer.h",
192 "common/system/audio/tray_audio.cc",
193 "common/system/audio/tray_audio.h",
194 "common/system/audio/tray_audio_delegate.h",
195 "common/system/audio/volume_view.cc",
196 "common/system/audio/volume_view.h",
197 "common/system/brightness_control_delegate.h", 191 "common/system/brightness_control_delegate.h",
198 "common/system/chromeos/audio/audio_detailed_view.cc", 192 "common/system/chromeos/audio/audio_detailed_view.cc",
199 "common/system/chromeos/audio/audio_detailed_view.h", 193 "common/system/chromeos/audio/audio_detailed_view.h",
200 "common/system/chromeos/audio/tray_audio_chromeos.cc", 194 "common/system/chromeos/audio/audio_observer.h",
201 "common/system/chromeos/audio/tray_audio_chromeos.h", 195 "common/system/chromeos/audio/tray_audio.cc",
196 "common/system/chromeos/audio/tray_audio.h",
197 "common/system/chromeos/audio/tray_audio_delegate.h",
202 "common/system/chromeos/audio/tray_audio_delegate_chromeos.cc", 198 "common/system/chromeos/audio/tray_audio_delegate_chromeos.cc",
203 "common/system/chromeos/audio/tray_audio_delegate_chromeos.h", 199 "common/system/chromeos/audio/tray_audio_delegate_chromeos.h",
200 "common/system/chromeos/audio/volume_view.cc",
201 "common/system/chromeos/audio/volume_view.h",
204 "common/system/chromeos/bluetooth/bluetooth_notification_controller.cc", 202 "common/system/chromeos/bluetooth/bluetooth_notification_controller.cc",
205 "common/system/chromeos/bluetooth/bluetooth_notification_controller.h", 203 "common/system/chromeos/bluetooth/bluetooth_notification_controller.h",
206 "common/system/chromeos/bluetooth/bluetooth_observer.h", 204 "common/system/chromeos/bluetooth/bluetooth_observer.h",
207 "common/system/chromeos/bluetooth/tray_bluetooth.cc", 205 "common/system/chromeos/bluetooth/tray_bluetooth.cc",
208 "common/system/chromeos/bluetooth/tray_bluetooth.h", 206 "common/system/chromeos/bluetooth/tray_bluetooth.h",
209 "common/system/chromeos/brightness/brightness_controller_chromeos.cc", 207 "common/system/chromeos/brightness/brightness_controller_chromeos.cc",
210 "common/system/chromeos/brightness/brightness_controller_chromeos.h", 208 "common/system/chromeos/brightness/brightness_controller_chromeos.h",
211 "common/system/chromeos/brightness/tray_brightness.cc", 209 "common/system/chromeos/brightness/tray_brightness.cc",
212 "common/system/chromeos/brightness/tray_brightness.h", 210 "common/system/chromeos/brightness/tray_brightness.h",
213 "common/system/chromeos/cast/tray_cast.cc", 211 "common/system/chromeos/cast/tray_cast.cc",
(...skipping 1279 matching lines...) Expand 10 before | Expand all | Expand 10 after
1493 if (is_win) { 1491 if (is_win) {
1494 configs -= [ "//build/config/win:console" ] 1492 configs -= [ "//build/config/win:console" ]
1495 configs += [ "//build/config/win:windowed" ] 1493 configs += [ "//build/config/win:windowed" ]
1496 deps += [ "//sandbox" ] 1494 deps += [ "//sandbox" ]
1497 } 1495 }
1498 1496
1499 if (is_chromeos) { 1497 if (is_chromeos) {
1500 deps += [ "//device/bluetooth" ] 1498 deps += [ "//device/bluetooth" ]
1501 } 1499 }
1502 } 1500 }
OLDNEW
« no previous file with comments | « no previous file | ash/common/system/audio/audio_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698