Refactor BalloonViewHost, removing a lot of duplicate code that crept into no...

chrome/browser/chromeos/notifications/balloon_view.cc

 // Copyright (c) 2010 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 <vector>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 54 matching lines @@
   const std::wstring source_label_text = l10n_util::GetStringF(
       IDS_NOTIFICATION_BALLOON_SOURCE_LABEL,
       balloon->notification().display_source());
   const std::wstring options_text =
       l10n_util::GetString(IDS_NOTIFICATION_OPTIONS_MENU_LABEL);
   const std::wstring dismiss_text =
       l10n_util::GetString(IDS_NOTIFICATION_BALLOON_DISMISS_LABEL);
   balloon_ = balloon;
 
   html_contents_ = new BalloonViewHost(balloon);
-  AddChildView(html_contents_);
+  AddChildView(html_contents_->view());
   if (controls_) {
     close_button_ = new views::TextButton(this, dismiss_text);
     close_button_->SetIcon(*rb.GetBitmapNamed(IDR_BALLOON_CLOSE));
     close_button_->SetHoverIcon(*rb.GetBitmapNamed(IDR_BALLOON_CLOSE_HOVER));
     close_button_->SetFont(rb.GetFont(ResourceBundle::SmallFont));
     close_button_->SetEnabledColor(SK_ColorWHITE);
     close_button_->SetHoverColor(SK_ColorDKGRAY);
     close_button_->set_alignment(views::TextButton::ALIGN_CENTER);
     close_button_->set_icon_placement(views::TextButton::ICON_ON_RIGHT);
     AddChildView(close_button_);
@@ skipping 16 matching lines @@
     source_label_->SetColor(SK_ColorWHITE);
     source_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
     AddChildView(source_label_);
   }
   notification_registrar_.Add(this,
     NotificationType::NOTIFY_BALLOON_DISCONNECTED, Source<Balloon>(balloon));
 }
 
 void BalloonViewImpl::Update() {
   stale_ = false;
-  html_contents_->render_view_host()->NavigateToURL(
-      balloon_->notification().content_url());
+  if (html_contents_->render_view_host())
+    html_contents_->render_view_host()->NavigateToURL(
+        balloon_->notification().content_url());
 }
 
 void BalloonViewImpl::Close(bool by_user) {
   MessageLoop::current()->PostTask(
       FROM_HERE,
       method_factory_.NewRunnableMethod(
           &BalloonViewImpl::DelayedClose, by_user));
 }
 
 gfx::Size BalloonViewImpl::GetSize() const {
@@ skipping 14 matching lines @@
     button_size = close_button_->GetPreferredSize();
   }
 
   SetBounds(x(), y(),
             balloon_->content_size().width(),
             balloon_->content_size().height() +
             button_size.height());
   int x = width() - button_size.width();
   int y = height() - button_size.height();
 
-  html_contents_->SetBounds(0, 0, width(), y);
+  html_contents_->view()->SetBounds(0, 0, width(), y);
   if (html_contents_->render_view_host()) {
     RenderWidgetHostView* view = html_contents_->render_view_host()->view();
     if (view)
       view->SetSize(gfx::Size(width(), y));
   }
   if (controls_) {
     close_button_->SetBounds(x, y, button_size.width(), button_size.height());
     x -= close_button_->GetPreferredSize().width();
     options_menu_button_->SetBounds(
         x, y, button_size.width(), button_size.height());
@@ skipping 83 matching lines @@
   options_menu_menu_.reset(new views::Menu2(options_menu_contents_.get()));
 }
 
 void BalloonViewImpl::DelayedClose(bool by_user) {
   html_contents_->Shutdown();
   html_contents_ = NULL;
   balloon_->OnClose(by_user);
 }
 
 }  // namespace chromeos