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

Side by Side Diff: chrome/browser/chromeos/system/ash_system_tray_delegate.cc

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 | « ash/system/tray/system_tray_notifier.cc ('k') | no next file » | 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 #include "chrome/browser/chromeos/system/ash_system_tray_delegate.h" 5 #include "chrome/browser/chromeos/system/ash_system_tray_delegate.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
11 11
12 #include "ash/ash_switches.h" 12 #include "ash/ash_switches.h"
13 #include "ash/desktop_background/desktop_background_controller.h" 13 #include "ash/desktop_background/desktop_background_controller.h"
14 #include "ash/shell.h" 14 #include "ash/shell.h"
15 #include "ash/shell_delegate.h" 15 #include "ash/shell_delegate.h"
16 #include "ash/shell_window_ids.h" 16 #include "ash/shell_window_ids.h"
17 #include "ash/system/audio/audio_observer.h"
18 #include "ash/system/bluetooth/bluetooth_observer.h" 17 #include "ash/system/bluetooth/bluetooth_observer.h"
19 #include "ash/system/brightness/brightness_observer.h" 18 #include "ash/system/brightness/brightness_observer.h"
19 #include "ash/system/chromeos/audio/audio_observer.h"
20 #include "ash/system/chromeos/network/network_observer.h" 20 #include "ash/system/chromeos/network/network_observer.h"
21 #include "ash/system/chromeos/network/network_tray_delegate.h" 21 #include "ash/system/chromeos/network/network_tray_delegate.h"
22 #include "ash/system/date/clock_observer.h" 22 #include "ash/system/date/clock_observer.h"
23 #include "ash/system/drive/drive_observer.h" 23 #include "ash/system/drive/drive_observer.h"
24 #include "ash/system/ime/ime_observer.h" 24 #include "ash/system/ime/ime_observer.h"
25 #include "ash/system/logout_button/logout_button_observer.h" 25 #include "ash/system/logout_button/logout_button_observer.h"
26 #include "ash/system/power/power_status_observer.h" 26 #include "ash/system/power/power_status_observer.h"
27 #include "ash/system/tray/system_tray.h" 27 #include "ash/system/tray/system_tray.h"
28 #include "ash/system/tray/system_tray_delegate.h" 28 #include "ash/system/tray/system_tray_delegate.h"
29 #include "ash/system/tray/system_tray_notifier.h" 29 #include "ash/system/tray/system_tray_notifier.h"
(...skipping 1552 matching lines...) Expand 10 before | Expand all | Expand 10 after
1582 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate); 1582 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate);
1583 }; 1583 };
1584 1584
1585 } // namespace 1585 } // namespace
1586 1586
1587 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { 1587 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
1588 return new chromeos::SystemTrayDelegate(); 1588 return new chromeos::SystemTrayDelegate();
1589 } 1589 }
1590 1590
1591 } // namespace chromeos 1591 } // namespace chromeos
OLDNEW
« no previous file with comments | « ash/system/tray/system_tray_notifier.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698