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

Side by Side Diff: ash/system/bluetooth/tray_bluetooth.h

Issue 10269017: Remove scoped_ptr for system tray views (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 7 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/audio/tray_volume.cc ('k') | ash/system/bluetooth/tray_bluetooth.cc » ('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 #ifndef ASH_SYSTEM_BLUETOOTH_TRAY_BLUETOOTH_H_ 5 #ifndef ASH_SYSTEM_BLUETOOTH_TRAY_BLUETOOTH_H_
6 #define ASH_SYSTEM_BLUETOOTH_TRAY_BLUETOOTH_H_ 6 #define ASH_SYSTEM_BLUETOOTH_TRAY_BLUETOOTH_H_
7 #pragma once 7 #pragma once
8 8
9 #include "ash/system/bluetooth/bluetooth_observer.h" 9 #include "ash/system/bluetooth/bluetooth_observer.h"
10 #include "ash/system/tray/system_tray_item.h" 10 #include "ash/system/tray/system_tray_item.h"
11 #include "base/memory/scoped_ptr.h"
12 11
13 namespace ash { 12 namespace ash {
14 namespace internal { 13 namespace internal {
15 14
16 namespace tray { 15 namespace tray {
17 class BluetoothDefaultView; 16 class BluetoothDefaultView;
18 class BluetoothDetailedView; 17 class BluetoothDetailedView;
19 } 18 }
20 19
21 class TrayBluetooth : public SystemTrayItem, 20 class TrayBluetooth : public SystemTrayItem,
22 public BluetoothObserver { 21 public BluetoothObserver {
23 public: 22 public:
24 TrayBluetooth(); 23 TrayBluetooth();
25 virtual ~TrayBluetooth(); 24 virtual ~TrayBluetooth();
26 25
27 private: 26 private:
28 // Overridden from SystemTrayItem. 27 // Overridden from SystemTrayItem.
29 virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE; 28 virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE;
30 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; 29 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE;
31 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE; 30 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE;
32 virtual void DestroyTrayView() OVERRIDE; 31 virtual void DestroyTrayView() OVERRIDE;
33 virtual void DestroyDefaultView() OVERRIDE; 32 virtual void DestroyDefaultView() OVERRIDE;
34 virtual void DestroyDetailedView() OVERRIDE; 33 virtual void DestroyDetailedView() OVERRIDE;
35 virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) OVERRIDE; 34 virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) OVERRIDE;
36 35
37 // Overridden from BluetoothObserver. 36 // Overridden from BluetoothObserver.
38 virtual void OnBluetoothRefresh() OVERRIDE; 37 virtual void OnBluetoothRefresh() OVERRIDE;
39 38
40 scoped_ptr<tray::BluetoothDefaultView> default_; 39 tray::BluetoothDefaultView* default_;
41 scoped_ptr<tray::BluetoothDetailedView> detailed_; 40 tray::BluetoothDetailedView* detailed_;
42 41
43 DISALLOW_COPY_AND_ASSIGN(TrayBluetooth); 42 DISALLOW_COPY_AND_ASSIGN(TrayBluetooth);
44 }; 43 };
45 44
46 } // namespace internal 45 } // namespace internal
47 } // namespace ash 46 } // namespace ash
48 47
49 #endif // ASH_SYSTEM_BLUETOOTH_TRAY_BLUETOOTH_H_ 48 #endif // ASH_SYSTEM_BLUETOOTH_TRAY_BLUETOOTH_H_
OLDNEW
« no previous file with comments | « ash/system/audio/tray_volume.cc ('k') | ash/system/bluetooth/tray_bluetooth.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698