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

Side by Side Diff: ash/system/network/tray_network.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/ime/tray_ime.cc ('k') | ash/system/network/tray_network.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_NETWORK_TRAY_NETWORK_H 5 #ifndef ASH_SYSTEM_NETWORK_TRAY_NETWORK_H
6 #define ASH_SYSTEM_NETWORK_TRAY_NETWORK_H 6 #define ASH_SYSTEM_NETWORK_TRAY_NETWORK_H
7 #pragma once 7 #pragma once
8 8
9 #include "ash/system/network/network_observer.h" 9 #include "ash/system/network/network_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 NetworkDefaultView; 16 class NetworkDefaultView;
18 class NetworkDetailedView; 17 class NetworkDetailedView;
19 class NetworkTrayView; 18 class NetworkTrayView;
20 } 19 }
21 20
22 class TrayNetwork : public SystemTrayItem, 21 class TrayNetwork : public SystemTrayItem,
23 public NetworkObserver { 22 public NetworkObserver {
24 public: 23 public:
25 TrayNetwork(); 24 TrayNetwork();
26 virtual ~TrayNetwork(); 25 virtual ~TrayNetwork();
27 26
28 private: 27 private:
29 // Overridden from SystemTrayItem. 28 // Overridden from SystemTrayItem.
30 virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE; 29 virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE;
31 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; 30 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE;
32 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE; 31 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE;
33 virtual void DestroyTrayView() OVERRIDE; 32 virtual void DestroyTrayView() OVERRIDE;
34 virtual void DestroyDefaultView() OVERRIDE; 33 virtual void DestroyDefaultView() OVERRIDE;
35 virtual void DestroyDetailedView() OVERRIDE; 34 virtual void DestroyDetailedView() OVERRIDE;
36 virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) OVERRIDE; 35 virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) OVERRIDE;
37 36
38 // Overridden from NetworkObserver. 37 // Overridden from NetworkObserver.
39 virtual void OnNetworkRefresh(const NetworkIconInfo& info) OVERRIDE; 38 virtual void OnNetworkRefresh(const NetworkIconInfo& info) OVERRIDE;
40 39
41 scoped_ptr<tray::NetworkTrayView> tray_; 40 tray::NetworkTrayView* tray_;
42 scoped_ptr<tray::NetworkDefaultView> default_; 41 tray::NetworkDefaultView* default_;
43 scoped_ptr<tray::NetworkDetailedView> detailed_; 42 tray::NetworkDetailedView* detailed_;
44 43
45 DISALLOW_COPY_AND_ASSIGN(TrayNetwork); 44 DISALLOW_COPY_AND_ASSIGN(TrayNetwork);
46 }; 45 };
47 46
48 } // namespace internal 47 } // namespace internal
49 } // namespace ash 48 } // namespace ash
50 49
51 #endif // ASH_SYSTEM_NETWORK_TRAY_NETWORK_H 50 #endif // ASH_SYSTEM_NETWORK_TRAY_NETWORK_H
OLDNEW
« no previous file with comments | « ash/system/ime/tray_ime.cc ('k') | ash/system/network/tray_network.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698