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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 9838085: Move files inside chrome/browser/chromeos/dbus to chromeos/dbus (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase Created 8 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
« no previous file with comments | « chrome/browser/chromeos/status/status_area_view_chromeos.cc ('k') | chrome/browser/chromeos/upgrade_detector_chromeos.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 #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 "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/shell_window_ids.h" 8 #include "ash/shell_window_ids.h"
9 #include "ash/system/audio/audio_observer.h" 9 #include "ash/system/audio/audio_observer.h"
10 #include "ash/system/bluetooth/bluetooth_observer.h" 10 #include "ash/system/bluetooth/bluetooth_observer.h"
(...skipping 10 matching lines...) Expand all
21 #include "ash/system/user/user_observer.h" 21 #include "ash/system/user/user_observer.h"
22 #include "base/chromeos/chromeos_version.h" 22 #include "base/chromeos/chromeos_version.h"
23 #include "base/logging.h" 23 #include "base/logging.h"
24 #include "base/utf_string_conversions.h" 24 #include "base/utf_string_conversions.h"
25 #include "chrome/browser/browser_process.h" 25 #include "chrome/browser/browser_process.h"
26 #include "chrome/browser/chromeos/audio/audio_handler.h" 26 #include "chrome/browser/chromeos/audio/audio_handler.h"
27 #include "chrome/browser/chromeos/bluetooth/bluetooth_adapter.h" 27 #include "chrome/browser/chromeos/bluetooth/bluetooth_adapter.h"
28 #include "chrome/browser/chromeos/bluetooth/bluetooth_device.h" 28 #include "chrome/browser/chromeos/bluetooth/bluetooth_device.h"
29 #include "chrome/browser/chromeos/cros/cros_library.h" 29 #include "chrome/browser/chromeos/cros/cros_library.h"
30 #include "chrome/browser/chromeos/cros/network_library.h" 30 #include "chrome/browser/chromeos/cros/network_library.h"
31 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
32 #include "chrome/browser/chromeos/dbus/power_manager_client.h"
33 #include "chrome/browser/chromeos/input_method/input_method_manager.h" 31 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
34 #include "chrome/browser/chromeos/input_method/input_method_util.h" 32 #include "chrome/browser/chromeos/input_method/input_method_util.h"
35 #include "chrome/browser/chromeos/input_method/input_method_whitelist.h" 33 #include "chrome/browser/chromeos/input_method/input_method_whitelist.h"
36 #include "chrome/browser/chromeos/input_method/xkeyboard.h" 34 #include "chrome/browser/chromeos/input_method/xkeyboard.h"
37 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" 35 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
38 #include "chrome/browser/chromeos/login/base_login_display_host.h" 36 #include "chrome/browser/chromeos/login/base_login_display_host.h"
39 #include "chrome/browser/chromeos/login/login_display_host.h" 37 #include "chrome/browser/chromeos/login/login_display_host.h"
40 #include "chrome/browser/chromeos/login/message_bubble.h" 38 #include "chrome/browser/chromeos/login/message_bubble.h"
41 #include "chrome/browser/chromeos/login/user.h" 39 #include "chrome/browser/chromeos/login/user.h"
42 #include "chrome/browser/chromeos/login/user_manager.h" 40 #include "chrome/browser/chromeos/login/user_manager.h"
43 #include "chrome/browser/chromeos/mobile_config.h" 41 #include "chrome/browser/chromeos/mobile_config.h"
44 #include "chrome/browser/chromeos/status/data_promo_notification.h" 42 #include "chrome/browser/chromeos/status/data_promo_notification.h"
45 #include "chrome/browser/chromeos/status/network_menu.h" 43 #include "chrome/browser/chromeos/status/network_menu.h"
46 #include "chrome/browser/chromeos/status/network_menu_icon.h" 44 #include "chrome/browser/chromeos/status/network_menu_icon.h"
47 #include "chrome/browser/chromeos/system/timezone_settings.h" 45 #include "chrome/browser/chromeos/system/timezone_settings.h"
48 #include "chrome/browser/chromeos/system_key_event_listener.h" 46 #include "chrome/browser/chromeos/system_key_event_listener.h"
49 #include "chrome/browser/prefs/pref_service.h" 47 #include "chrome/browser/prefs/pref_service.h"
50 #include "chrome/browser/profiles/profile_manager.h" 48 #include "chrome/browser/profiles/profile_manager.h"
51 #include "chrome/browser/ui/browser.h" 49 #include "chrome/browser/ui/browser.h"
52 #include "chrome/browser/ui/browser_list.h" 50 #include "chrome/browser/ui/browser_list.h"
53 #include "chrome/browser/upgrade_detector.h" 51 #include "chrome/browser/upgrade_detector.h"
52 #include "chrome/common/chrome_notification_types.h"
54 #include "chrome/common/pref_names.h" 53 #include "chrome/common/pref_names.h"
55 #include "chrome/common/chrome_notification_types.h" 54 #include "chromeos/dbus/dbus_thread_manager.h"
55 #include "chromeos/dbus/power_manager_client.h"
56 #include "content/public/browser/notification_observer.h" 56 #include "content/public/browser/notification_observer.h"
57 #include "content/public/browser/notification_service.h" 57 #include "content/public/browser/notification_service.h"
58 #include "grit/generated_resources.h" 58 #include "grit/generated_resources.h"
59 #include "ui/base/l10n/l10n_util.h" 59 #include "ui/base/l10n/l10n_util.h"
60 60
61 namespace chromeos { 61 namespace chromeos {
62 62
63 namespace { 63 namespace {
64 64
65 bool ShouldShowNetworkIconInTray(const Network* network) { 65 bool ShouldShowNetworkIconInTray(const Network* network) {
(...skipping 903 matching lines...) Expand 10 before | Expand all | Expand 10 after
969 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate); 969 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate);
970 }; 970 };
971 971
972 } // namespace 972 } // namespace
973 973
974 ash::SystemTrayDelegate* CreateSystemTrayDelegate(ash::SystemTray* tray) { 974 ash::SystemTrayDelegate* CreateSystemTrayDelegate(ash::SystemTray* tray) {
975 return new chromeos::SystemTrayDelegate(tray); 975 return new chromeos::SystemTrayDelegate(tray);
976 } 976 }
977 977
978 } // namespace chromeos 978 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/status/status_area_view_chromeos.cc ('k') | chrome/browser/chromeos/upgrade_detector_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698