| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/ui/ash/system_tray_delegate_chromeos.h" | 5 #include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <algorithm> | 9 #include <algorithm> |
| 10 #include <set> | 10 #include <set> |
| (...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 250 weak_ptr_factory_.GetWeakPtr())); | 250 weak_ptr_factory_.GetWeakPtr())); |
| 251 | 251 |
| 252 ash::WmShell::Get()->GetSessionStateDelegate()->AddSessionStateObserver(this); | 252 ash::WmShell::Get()->GetSessionStateDelegate()->AddSessionStateObserver(this); |
| 253 | 253 |
| 254 if (CrasAudioHandler::IsInitialized()) | 254 if (CrasAudioHandler::IsInitialized()) |
| 255 CrasAudioHandler::Get()->AddAudioObserver(this); | 255 CrasAudioHandler::Get()->AddAudioObserver(this); |
| 256 | 256 |
| 257 BrowserList::AddObserver(this); | 257 BrowserList::AddObserver(this); |
| 258 } | 258 } |
| 259 | 259 |
| 260 void SystemTrayDelegateChromeOS::Shutdown() { | |
| 261 } | |
| 262 | |
| 263 void SystemTrayDelegateChromeOS::InitializeOnAdapterReady( | 260 void SystemTrayDelegateChromeOS::InitializeOnAdapterReady( |
| 264 scoped_refptr<device::BluetoothAdapter> adapter) { | 261 scoped_refptr<device::BluetoothAdapter> adapter) { |
| 265 bluetooth_adapter_ = adapter; | 262 bluetooth_adapter_ = adapter; |
| 266 CHECK(bluetooth_adapter_.get()); | 263 CHECK(bluetooth_adapter_.get()); |
| 267 bluetooth_adapter_->AddObserver(this); | 264 bluetooth_adapter_->AddObserver(this); |
| 268 | 265 |
| 269 local_state_registrar_.reset(new PrefChangeRegistrar); | 266 local_state_registrar_.reset(new PrefChangeRegistrar); |
| 270 local_state_registrar_->Init(g_browser_process->local_state()); | 267 local_state_registrar_->Init(g_browser_process->local_state()); |
| 271 | 268 |
| 272 UpdateSessionStartTime(); | 269 UpdateSessionStartTime(); |
| (...skipping 1052 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1325 LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while " | 1322 LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while " |
| 1326 << "ENABLE_SUPERVISED_USERS undefined."; | 1323 << "ENABLE_SUPERVISED_USERS undefined."; |
| 1327 return base::string16(); | 1324 return base::string16(); |
| 1328 } | 1325 } |
| 1329 | 1326 |
| 1330 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { | 1327 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { |
| 1331 return new SystemTrayDelegateChromeOS(); | 1328 return new SystemTrayDelegateChromeOS(); |
| 1332 } | 1329 } |
| 1333 | 1330 |
| 1334 } // namespace chromeos | 1331 } // namespace chromeos |
| OLD | NEW |