Remove scoped_ptr for system tray views

ash/system/tray_caps_lock.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/tray_caps_lock.h"
 
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_views.h"
@@ skipping 80 matching lines @@
   }
 
   views::Label* text_label_;
   views::Label* shortcut_label_;
 
   DISALLOW_COPY_AND_ASSIGN(CapsLockDefaultView);
 };
 
 TrayCapsLock::TrayCapsLock()
     : TrayImageItem(IDR_AURA_UBER_TRAY_CAPS_LOCK),
+      default_(NULL),
+      detailed_(NULL),
       search_mapped_to_caps_lock_(false),
       caps_lock_enabled_(
           Shell::GetInstance()->tray_delegate()->IsCapsLockOn()) {
 }
 
 TrayCapsLock::~TrayCapsLock() {}
 
 bool TrayCapsLock::GetInitialVisibility() {
   return Shell::GetInstance()->tray_delegate()->IsCapsLockOn();
 }
 
 views::View* TrayCapsLock::CreateDefaultView(user::LoginStatus status) {
   if (!caps_lock_enabled_)
     return NULL;
-  default_.reset(new CapsLockDefaultView);
+  DCHECK(default_ == NULL);
+  default_ = new CapsLockDefaultView;
   default_->Update(caps_lock_enabled_, search_mapped_to_caps_lock_);
-  return default_.get();
+  return default_;
 }
 
 views::View* TrayCapsLock::CreateDetailedView(user::LoginStatus status) {
-  detailed_.reset(new views::View);
+  DCHECK(detailed_ == NULL);
+  detailed_ = new views::View;
 
   detailed_->SetLayoutManager(new
       views::BoxLayout(views::BoxLayout::kHorizontal,
       kTrayPopupPaddingHorizontal, 10, kTrayPopupPaddingBetweenItems));
 
   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
   views::ImageView* image = new views::ImageView;
   image->SetImage(bundle.GetImageNamed(IDR_AURA_UBER_TRAY_CAPS_LOCK_DARK).
       ToSkBitmap());
 
   detailed_->AddChildView(image);
 
   const int string_id = search_mapped_to_caps_lock_ ?
       IDS_ASH_STATUS_TRAY_CAPS_LOCK_ENABLED_PRESS_SEARCH :
       IDS_ASH_STATUS_TRAY_CAPS_LOCK_ENABLED_PRESS_SHIFT_AND_SEARCH_KEYS;
   detailed_->AddChildView(
       new views::Label(bundle.GetLocalizedString(string_id)));
 
-  return detailed_.get();
+  return detailed_;
 }
 
 void TrayCapsLock::DestroyDefaultView() {
-  default_.reset();
+  default_ = NULL;
 }
 
 void TrayCapsLock::DestroyDetailedView() {
-  detailed_.reset();
+  detailed_ = NULL;
 }
 
 void TrayCapsLock::OnCapsLockChanged(bool enabled,
                                      bool search_mapped_to_caps_lock) {
   if (tray_view())
     tray_view()->SetVisible(enabled);
 
   caps_lock_enabled_ = enabled;
   search_mapped_to_caps_lock_ = search_mapped_to_caps_lock;
 
-  if (default_.get()) {
+  if (default_) {
     default_->Update(enabled, search_mapped_to_caps_lock);
   } else {
     if (enabled)
       PopupDetailedView(kTrayPopupAutoCloseDelayForTextInSeconds, false);
-    else if (detailed_.get())
+    else if (detailed_)
       detailed_->GetWidget()->Close();
   }
 }
 
 }  // namespace internal
 }  // namespace ash