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 308 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
319 AddSessionStateObserver(this); | 319 AddSessionStateObserver(this); |
320 } | 320 } |
321 | 321 |
322 virtual void Shutdown() OVERRIDE { | 322 virtual void Shutdown() OVERRIDE { |
323 data_promo_notification_.reset(); | 323 data_promo_notification_.reset(); |
324 } | 324 } |
325 | 325 |
326 void InitializeOnAdapterReady( | 326 void InitializeOnAdapterReady( |
327 scoped_refptr<device::BluetoothAdapter> adapter) { | 327 scoped_refptr<device::BluetoothAdapter> adapter) { |
328 bluetooth_adapter_ = adapter; | 328 bluetooth_adapter_ = adapter; |
329 CHECK(bluetooth_adapter_); | 329 CHECK(bluetooth_adapter_.get()); |
330 bluetooth_adapter_->AddObserver(this); | 330 bluetooth_adapter_->AddObserver(this); |
331 | 331 |
332 local_state_registrar_.reset(new PrefChangeRegistrar); | 332 local_state_registrar_.reset(new PrefChangeRegistrar); |
333 local_state_registrar_->Init(g_browser_process->local_state()); | 333 local_state_registrar_->Init(g_browser_process->local_state()); |
334 | 334 |
335 UpdateSessionStartTime(); | 335 UpdateSessionStartTime(); |
336 UpdateSessionLengthLimit(); | 336 UpdateSessionLengthLimit(); |
337 | 337 |
338 local_state_registrar_->Add( | 338 local_state_registrar_->Add( |
339 prefs::kSessionStartTime, | 339 prefs::kSessionStartTime, |
(...skipping 982 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1322 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate); | 1322 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate); |
1323 }; | 1323 }; |
1324 | 1324 |
1325 } // namespace | 1325 } // namespace |
1326 | 1326 |
1327 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { | 1327 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { |
1328 return new chromeos::SystemTrayDelegate(); | 1328 return new chromeos::SystemTrayDelegate(); |
1329 } | 1329 } |
1330 | 1330 |
1331 } // namespace chromeos | 1331 } // namespace chromeos |
OLD | NEW |