Prepare SystemTray to support notifications

ash/system/bluetooth/tray_bluetooth.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/system/bluetooth/tray_bluetooth.h"
 
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/tray_constants.h"
@@ skipping 197 matching lines @@
   views::View* header_text_;
   views::View* add_device_;
   TrayPopupHeaderButton* toggle_bluetooth_;
   views::View* settings_;
 
   DISALLOW_COPY_AND_ASSIGN(BluetoothDetailedView);
 };
 
 }  // namespace tray
 
-TrayBluetooth::TrayBluetooth() {
+TrayBluetooth::TrayBluetooth()
+    : default_(NULL),
+      detailed_(NULL) {
 }
 
 TrayBluetooth::~TrayBluetooth() {
 }
 
 views::View* TrayBluetooth::CreateTrayView(user::LoginStatus status) {
   return NULL;
 }
 
 views::View* TrayBluetooth::CreateDefaultView(user::LoginStatus status) {
   if (!Shell::GetInstance()->tray_delegate()->GetBluetoothAvailable())
     return NULL;
-  default_.reset(new tray::BluetoothDefaultView(this));
-  return default_.get();
+  DCHECK(default_ == NULL);
+  default_ = new tray::BluetoothDefaultView(this);
+  return default_;
 }
 
 views::View* TrayBluetooth::CreateDetailedView(user::LoginStatus status) {
   if (!Shell::GetInstance()->tray_delegate()->GetBluetoothAvailable())
     return NULL;
-  detailed_.reset(new tray::BluetoothDetailedView(status));
-  return detailed_.get();
+  DCHECK(detailed_ == NULL);
+  detailed_ = new tray::BluetoothDetailedView(status);
+  return detailed_;
 }
 
 void TrayBluetooth::DestroyTrayView() {
 }
 
 void TrayBluetooth::DestroyDefaultView() {
-  default_.reset();
+  default_ = NULL;
 }
 
 void TrayBluetooth::DestroyDetailedView() {
-  detailed_.reset();
+  detailed_ = NULL;
 }
 
 void TrayBluetooth::UpdateAfterLoginStatusChange(user::LoginStatus status) {
 }
 
 void TrayBluetooth::OnBluetoothRefresh() {
   BluetoothDeviceList list;
   Shell::GetInstance()->tray_delegate()->GetAvailableBluetoothDevices(&list);
-  if (default_.get())
+  if (default_)
     default_->UpdateLabel();
-  if (detailed_.get())
+  if (detailed_)
     detailed_->Update(list);
 }
 
 }  // namespace internal
 }  // namespace ash