Add more checks to ShowPageActionPopup

chrome/browser/ui/views/location_bar/location_bar_view.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/ui/views/location_bar/location_bar_view.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/i18n/rtl.h"
@@ skipping 166 matching lines @@
       search_button_(NULL),
       is_popup_mode_(is_popup_mode),
       show_focus_rect_(false),
       template_url_service_(NULL),
       dropdown_animation_offset_(0),
       starting_omnibox_offset_(0),
       current_omnibox_offset_(0),
       starting_omnibox_leading_inset_(0),
       current_omnibox_leading_inset_(0),
       current_omnibox_width_(0),
-      ending_omnibox_width_(0) {
+      ending_omnibox_width_(0),
+      web_contents_not_null_at_last_refresh_(false) {
   edit_bookmarks_enabled_.Init(
       bookmarks::prefs::kEditBookmarksEnabled, profile->GetPrefs(),
       base::Bind(&LocationBarView::Update, base::Unretained(this),
                  static_cast<content::WebContents*>(NULL)));
 
   if (browser_)
     browser_->search_model()->AddObserver(this);
 }
 
 LocationBarView::~LocationBarView() {
@@ skipping 873 matching lines @@
   PageActions new_page_actions;
 
   WebContents* web_contents = GetWebContents();
   if (web_contents) {
     extensions::TabHelper* extensions_tab_helper =
         extensions::TabHelper::FromWebContents(web_contents);
     extensions::LocationBarController* controller =
         extensions_tab_helper->location_bar_controller();
     new_page_actions = controller->GetCurrentActions();
   }
+  web_contents_not_null_at_last_refresh_ = web_contents != NULL;

[Peter Kasting, 2014/12/19 22:14:12]

Super-tiny nit, but I'd change "not_null" to "null" here and then add a !
operator at the lone use below -- that seems fractionally easier to mentally
parse, to me, somehow.

 
   // On startup we sometimes haven't loaded any extensions. This makes sure
   // we catch up when the extensions (and any page actions) load.
   if (page_actions_ != new_page_actions) {
     changed = true;
 
     page_actions_.swap(new_page_actions);
     DeletePageActionViews();  // Delete the old views (if any).
 
     // Create the page action views.
@@ skipping 217 matching lines @@
 
 bool LocationBarView::ShowPageActionPopup(
     const extensions::Extension* extension,
     bool grant_tab_permissions) {
   ExtensionAction* extension_action =
       extensions::ExtensionActionManager::Get(profile())->GetPageAction(
           *extension);
   CHECK(extension_action);
   PageActionWithBadgeView* page_action_view =
       GetPageActionView(extension_action);
-  CHECK(page_action_view);
+  if (!page_action_view) {
+    CHECK(web_contents_not_null_at_last_refresh_);
+    CHECK(!is_popup_mode_);
+    CHECK(!extensions::FeatureSwitch::extension_action_redesign()->IsEnabled());
+    CHECK(false);
+  }
   PageActionImageView* page_action_image_view = page_action_view->image_view();
   CHECK(page_action_image_view);
   ExtensionActionViewController* extension_action_view_controller =
       page_action_image_view->view_controller();
   CHECK(extension_action_view_controller);
   return extension_action_view_controller->ExecuteAction(grant_tab_permissions);
 }
 
 void LocationBarView::UpdateOpenPDFInReaderPrompt() {
   open_pdf_in_reader_view_->Update(
@@ skipping 336 matching lines @@
 
 void LocationBarView::ModelChanged(const SearchModel::State& old_state,
                                    const SearchModel::State& new_state) {
   const bool visible = !GetToolbarModel()->input_in_progress() &&
       new_state.voice_search_supported;
   if (mic_search_view_->visible() != visible) {
     mic_search_view_->SetVisible(visible);
     Layout();
   }
 }