Make html_contents_ in BallonViewImpl scoped_ptr.

chrome/browser/chromeos/notifications/balloon_view.cc

 // Copyright (c) 2011 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 "chrome/browser/chromeos/notifications/balloon_view.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 196 matching lines @@
       web_ui_(web_ui) {
   // This object is not to be deleted by the views hierarchy,
   // as it is owned by the balloon.
   set_parent_owned(false);
 }
 
 BalloonViewImpl::~BalloonViewImpl() {
   if (control_view_host_.get()) {
     control_view_host_->CloseNow();
   }
-  if (html_contents_) {
+  if (html_contents_.get()) {
     html_contents_->Shutdown();
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // BallonViewImpl, BalloonView implementation.
 
 void BalloonViewImpl::Show(Balloon* balloon) {
   balloon_ = balloon;
-  html_contents_ = new BalloonViewHost(balloon);
+  html_contents_.reset(new BalloonViewHost(balloon));
   if (web_ui_)
     html_contents_->EnableWebUI();
   AddChildView(html_contents_->view());
   notification_registrar_.Add(this,
     chrome::NOTIFICATION_NOTIFY_BALLOON_DISCONNECTED,
     content::Source<Balloon>(balloon));
 }
 
 void BalloonViewImpl::Update() {
   stale_ = false;
@@ skipping 10 matching lines @@
       FROM_HERE,
       base::Bind(&BalloonViewImpl::DelayedClose, AsWeakPtr(), by_user));
 }
 
 gfx::Size BalloonViewImpl::GetSize() const {
   // Not used. The layout is managed by the Panel.
   return gfx::Size(0, 0);
 }
 
 BalloonHost* BalloonViewImpl::GetHost() const {
-  return html_contents_;
+  return html_contents_.get();
 }
 
 void BalloonViewImpl::RepositionToBalloon() {
   // Not used. The layout is managed by the Panel.
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // views::View interface overrides.
 
 void BalloonViewImpl::Layout() {
@@ skipping 76 matching lines @@
   if (control_view_host_.get()) {
     control_view_host_->Hide();
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // BalloonViewImpl private.
 
 void BalloonViewImpl::DelayedClose(bool by_user) {
   html_contents_->Shutdown();
-  html_contents_ = NULL;
+  html_contents_.reset();
   balloon_->OnClose(by_user);
 }
 
 void BalloonViewImpl::DenyPermission() {
   DesktopNotificationService* service =
       DesktopNotificationServiceFactory::GetForProfile(balloon_->profile());
   service->DenyPermission(balloon_->notification().origin_url());
 }
 
 gfx::NativeView BalloonViewImpl::GetParentNativeView() {
   RenderWidgetHostView* view =
       html_contents_->tab_contents()->render_view_host()->view();
   DCHECK(view);
   return view->GetNativeView();
 }
 
 }  // namespace chromeos