Speech Recognition API: Safeguarding against page closes during startup

chrome/browser/ui/views/speech_recognition_bubble_views.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 "chrome/browser/speech/speech_recognition_bubble.h"
 
 #include <algorithm>
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 294 matching lines @@
       int width = cancel_->GetPreferredSize().width();
       cancel_->SetBounds(x + (available_width - width) / 2, y, width,
                          control_height);
     }
   }
 }
 
 // Implementation of SpeechRecognitionBubble.
 class SpeechRecognitionBubbleImpl : public SpeechRecognitionBubbleBase {
  public:
-  SpeechRecognitionBubbleImpl(WebContents* web_contents,
+  SpeechRecognitionBubbleImpl(int render_process_id, int render_view_id,
                               Delegate* delegate,
                               const gfx::Rect& element_rect);
   virtual ~SpeechRecognitionBubbleImpl();
 
   // SpeechRecognitionBubble methods.
   virtual void Show() OVERRIDE;
   virtual void Hide() OVERRIDE;
 
   // SpeechRecognitionBubbleBase methods.
   virtual void UpdateLayout() OVERRIDE;
   virtual void UpdateImage() OVERRIDE;
 
  private:
   Delegate* delegate_;
   SpeechRecognitionBubbleView* bubble_;
   gfx::Rect element_rect_;
 
   DISALLOW_COPY_AND_ASSIGN(SpeechRecognitionBubbleImpl);
 };
 
 SpeechRecognitionBubbleImpl::SpeechRecognitionBubbleImpl(
-    WebContents* web_contents, Delegate* delegate,
+    int render_process_id, int render_view_id, Delegate* delegate,
     const gfx::Rect& element_rect)
-    : SpeechRecognitionBubbleBase(web_contents),
+    : SpeechRecognitionBubbleBase(render_process_id, render_view_id),
       delegate_(delegate),
       bubble_(NULL),
       element_rect_(element_rect) {
 }
 
 SpeechRecognitionBubbleImpl::~SpeechRecognitionBubbleImpl() {
   if (bubble_) {
     bubble_->set_notify_delegate_on_activation_change(false);
     bubble_->GetWidget()->Close();
   }
 }
 
 void SpeechRecognitionBubbleImpl::Show() {
+  WebContents* web_contents = GetWebContents();
+  if (!web_contents)
+    return;
+
   if (!bubble_) {
     views::View* icon = NULL;
 
     // Anchor to the location bar, in case |element_rect| is offscreen.
-    WebContents* web_contents = GetWebContents();
     Browser* browser = chrome::FindBrowserWithWebContents(web_contents);
     if (browser) {
       BrowserView* browser_view =
           BrowserView::GetBrowserViewForBrowser(browser);
       icon = browser_view->GetLocationBarView() ?
           browser_view->GetLocationBarView()->GetLocationBarAnchor() : NULL;
     }
 
     bubble_ = new SpeechRecognitionBubbleView(delegate_, icon, element_rect_,
                                               web_contents);
 
     if (!icon) {
       // We dont't have an icon to attach to. Manually specify the web contents
       // window as the parent.
       bubble_->set_parent_window(
           web_contents->GetView()->GetTopLevelNativeWindow());
     }
 
     views::BubbleDelegateView::CreateBubble(bubble_);
     UpdateLayout();
   }
   bubble_->GetWidget()->Show();
 }
 
 void SpeechRecognitionBubbleImpl::Hide() {
-  if (bubble_)
+  WebContents* web_contents = GetWebContents();
+  if (bubble_ && web_contents)

[Primiano Tucci (use gerrit), 2014/02/10 21:43:37]

nit: You could fit all in one line, without the web_contents variable. E.g.,
if (bubble_ && GetWebContents())

[tommi (sloooow) - chröme, 2014/02/10 22:32:53]

+1 that also avoids calling GetWebContents if bubble_ == NULL ;-)

[Tommy Widenflycht, 2014/02/12 11:35:43]

Done.

[Tommy Widenflycht, 2014/02/12 11:35:43]

Done.

     bubble_->GetWidget()->Hide();
 }
 
 void SpeechRecognitionBubbleImpl::UpdateLayout() {
-  if (bubble_)
+  WebContents* web_contents = GetWebContents();
+  if (bubble_ && web_contents)
     bubble_->UpdateLayout(display_mode(), message_text(), icon_image());
 }
 
 void SpeechRecognitionBubbleImpl::UpdateImage() {
-  if (bubble_)
+  WebContents* web_contents = GetWebContents();
+  if (bubble_ && web_contents)
     bubble_->SetImage(icon_image());
 }
 
 }  // namespace
 
 SpeechRecognitionBubble* SpeechRecognitionBubble::CreateNativeBubble(
-    WebContents* web_contents,
+    int render_process_id, int render_view_id,
     SpeechRecognitionBubble::Delegate* delegate,
     const gfx::Rect& element_rect) {
-  return new SpeechRecognitionBubbleImpl(web_contents, delegate, element_rect);
+  return new SpeechRecognitionBubbleImpl(render_process_id, render_view_id,
+      delegate, element_rect);
 }