| OLD | NEW |
| 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> |
| (...skipping 23 matching lines...) Expand all Loading... |
| 34 #include "ash/system/user/user_observer.h" | 34 #include "ash/system/user/user_observer.h" |
| 35 #include "ash/volume_control_delegate.h" | 35 #include "ash/volume_control_delegate.h" |
| 36 #include "ash/wm/lock_state_controller.h" | 36 #include "ash/wm/lock_state_controller.h" |
| 37 #include "base/bind_helpers.h" | 37 #include "base/bind_helpers.h" |
| 38 #include "base/callback.h" | 38 #include "base/callback.h" |
| 39 #include "base/chromeos/chromeos_version.h" | 39 #include "base/chromeos/chromeos_version.h" |
| 40 #include "base/command_line.h" | 40 #include "base/command_line.h" |
| 41 #include "base/logging.h" | 41 #include "base/logging.h" |
| 42 #include "base/memory/weak_ptr.h" | 42 #include "base/memory/weak_ptr.h" |
| 43 #include "base/prefs/pref_service.h" | 43 #include "base/prefs/pref_service.h" |
| 44 #include "base/stringprintf.h" | 44 #include "base/strings/stringprintf.h" |
| 45 #include "base/strings/utf_string_conversions.h" | 45 #include "base/strings/utf_string_conversions.h" |
| 46 #include "base/time.h" | 46 #include "base/time.h" |
| 47 #include "chrome/browser/browser_process.h" | 47 #include "chrome/browser/browser_process.h" |
| 48 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" | 48 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" |
| 49 #include "chrome/browser/chromeos/accessibility/magnification_manager.h" | 49 #include "chrome/browser/chromeos/accessibility/magnification_manager.h" |
| 50 #include "chrome/browser/chromeos/audio/audio_handler.h" | 50 #include "chrome/browser/chromeos/audio/audio_handler.h" |
| 51 #include "chrome/browser/chromeos/bluetooth/bluetooth_pairing_dialog.h" | 51 #include "chrome/browser/chromeos/bluetooth/bluetooth_pairing_dialog.h" |
| 52 #include "chrome/browser/chromeos/choose_mobile_network_dialog.h" | 52 #include "chrome/browser/chromeos/choose_mobile_network_dialog.h" |
| 53 #include "chrome/browser/chromeos/cros/cros_library.h" | 53 #include "chrome/browser/chromeos/cros/cros_library.h" |
| 54 #include "chrome/browser/chromeos/cros/network_library.h" | 54 #include "chrome/browser/chromeos/cros/network_library.h" |
| (...skipping 1291 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1346 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate); | 1346 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate); |
| 1347 }; | 1347 }; |
| 1348 | 1348 |
| 1349 } // namespace | 1349 } // namespace |
| 1350 | 1350 |
| 1351 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { | 1351 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { |
| 1352 return new chromeos::SystemTrayDelegate(); | 1352 return new chromeos::SystemTrayDelegate(); |
| 1353 } | 1353 } |
| 1354 | 1354 |
| 1355 } // namespace chromeos | 1355 } // namespace chromeos |
| OLD | NEW |