ash/system/power/tray_power.h - Issue 10269017: Remove scoped_ptr for system tray views

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: ash/system/power/tray_power.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/network/tray_network.cc ('k') | ash/system/power/tray_power.cc » ('j') | no next file with comments »

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 #ifndef ASH_SYSTEM_POWER_TRAY_POWER_H_	5 #ifndef ASH_SYSTEM_POWER_TRAY_POWER_H_

6 #define ASH_SYSTEM_POWER_TRAY_POWER_H_	6 #define ASH_SYSTEM_POWER_TRAY_POWER_H_

7 #pragma once	7 #pragma once

8	8

9 #include "ash/system/power/power_status_observer.h"	9 #include "ash/system/power/power_status_observer.h"

10 #include "ash/system/tray/system_tray_item.h"	10 #include "ash/system/tray/system_tray_item.h"

(...skipping 19 matching lines...) Expand all Loading...
30 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE;	30 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE;

31 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE;	31 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE;

32 virtual void DestroyTrayView() OVERRIDE;	32 virtual void DestroyTrayView() OVERRIDE;

33 virtual void DestroyDefaultView() OVERRIDE;	33 virtual void DestroyDefaultView() OVERRIDE;

34 virtual void DestroyDetailedView() OVERRIDE;	34 virtual void DestroyDetailedView() OVERRIDE;

35 virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) OVERRIDE;	35 virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) OVERRIDE;

36	36

37 // Overridden from PowerStatusObserver.	37 // Overridden from PowerStatusObserver.

38 virtual void OnPowerStatusChanged(const PowerSupplyStatus& status) OVERRIDE;	38 virtual void OnPowerStatusChanged(const PowerSupplyStatus& status) OVERRIDE;

39	39

40 scoped_ptr<tray::DateView> date_;	40 tray::DateView* date_;

41 scoped_ptr<tray::PowerPopupView> power_;	41 tray::PowerPopupView* power_;

42 scoped_ptr<tray::PowerTrayView> power_tray_;	42 tray::PowerTrayView* power_tray_;

43	43

44 DISALLOW_COPY_AND_ASSIGN(TrayPower);	44 DISALLOW_COPY_AND_ASSIGN(TrayPower);

45 };	45 };

46	46

47 } // namespace internal	47 } // namespace internal

48 } // namespace ash	48 } // namespace ash

49	49

50 #endif // ASH_SYSTEM_POWER_TRAY_POWER_H_	50 #endif // ASH_SYSTEM_POWER_TRAY_POWER_H_

OLD	NEW