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

Unified Diff: ash/system/date/tray_date.cc

Issue 10235010: Prepare SystemTray to support notifications (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: ash/system/date/tray_date.cc
diff --git a/ash/system/date/tray_date.cc b/ash/system/date/tray_date.cc
index fb8d82954cf26eb239c0ef60f0fec25f251a0ebe..846064fdcaf703f03fe79314237600944902ba1b 100644
--- a/ash/system/date/tray_date.cc
+++ b/ash/system/date/tray_date.cc
@@ -35,14 +35,16 @@
namespace ash {
namespace internal {
-TrayDate::TrayDate() {
+TrayDate::TrayDate()
+ : date_tray_(NULL) {
}
TrayDate::~TrayDate() {
}
views::View* TrayDate::CreateTrayView(user::LoginStatus status) {
- date_tray_.reset(new tray::DateView(tray::DateView::TIME));
+ DCHECK(date_tray_ == NULL);
+ date_tray_ = new tray::DateView(tray::DateView::TIME);
date_tray_->set_border(
views::Border::CreateEmptyBorder(0, 10, 0, 7));
SetupLabelForTray(date_tray_->label());
@@ -51,7 +53,7 @@ views::View* TrayDate::CreateTrayView(user::LoginStatus status) {
font.DeriveFont(0, font.GetStyle() & ~gfx::Font::BOLD));
views::View* view = new TrayItemView;
- view->AddChildView(date_tray_.get());
+ view->AddChildView(date_tray_);
return view;
}
@@ -64,7 +66,7 @@ views::View* TrayDate::CreateDetailedView(user::LoginStatus status) {
}
void TrayDate::DestroyTrayView() {
- date_tray_.reset();
+ date_tray_ = NULL;
}
void TrayDate::DestroyDefaultView() {

Powered by Google App Engine
This is Rietveld 408576698