diff options
| author | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-01 16:53:10 +0000 |
|---|---|---|
| committer | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-01 16:53:10 +0000 |
| commit | 1d06b181a17291d42ee2aa303b3e925d98954e9b (patch) | |
| tree | 15c2c51cc91d1d1452a1035dbed0139c93c32d99 /ash/system/tray_update.cc | |
| parent | 776f8fdd880c5bd1403a6df8f753c25f803c7274 (diff) | |
| download | chromium_src-1d06b181a17291d42ee2aa303b3e925d98954e9b.zip chromium_src-1d06b181a17291d42ee2aa303b3e925d98954e9b.tar.gz chromium_src-1d06b181a17291d42ee2aa303b3e925d98954e9b.tar.bz2 | |
Remove scoped_ptr for system tray views
Views are owned by their parent, so having an additional scoped_ptr to them in the associated item/model is confusing and misleading.
BUG=124269
TEST=Test status area
Review URL: http://codereview.chromium.org/10269017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134710 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/system/tray_update.cc')
| -rw-r--r-- | ash/system/tray_update.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/ash/system/tray_update.cc b/ash/system/tray_update.cc index 8d13995..0c0ee04 100644 --- a/ash/system/tray_update.cc +++ b/ash/system/tray_update.cc @@ -69,12 +69,10 @@ bool TrayUpdate::GetInitialVisibility() { views::View* TrayUpdate::CreateDefaultView(user::LoginStatus status) { if (!Shell::GetInstance()->tray_delegate()->SystemShouldUpgrade()) return NULL; - default_.reset(new UpdateView); - return default_.get(); + return new UpdateView; } void TrayUpdate::DestroyDefaultView() { - default_.reset(); } void TrayUpdate::OnUpdateRecommended() { |