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

chrome/browser/chromeos/notifications/balloon_view.cc

Index: chrome/browser/chromeos/notifications/balloon_view.cc
===================================================================
--- chrome/browser/chromeos/notifications/balloon_view.cc	(revision 42363)
+++ chrome/browser/chromeos/notifications/balloon_view.cc	(working copy)
@@ -72,7 +72,7 @@
   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));
@@ -109,8 +109,9 @@
 
 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) {
@@ -145,7 +146,7 @@
   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)