A better fix for crash when opening Incognito window.

chrome/browser/ui/views/toolbar/toolbar_view.cc

 // Copyright 2013 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/toolbar/toolbar_view.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
@@ skipping 266 matching lines @@
   if (visible) {
     // Safe to call multiple times; the bubble will only appear once.
     extension_message_bubble_factory_->MaybeShow(app_menu_);
   }
 }
 
 void ToolbarView::OnWidgetActivationChanged(views::Widget* widget,
                                             bool active) {
   extensions::ExtensionCommandsGlobalRegistry* registry =
       extensions::ExtensionCommandsGlobalRegistry::Get(browser_->profile());
-  if (registry) {
-    if (active) {
-      registry->set_registry_for_active_window(
-          browser_actions_->extension_keybinding_registry());
-    } else if (registry->registry_for_active_window() ==
-               browser_actions_->extension_keybinding_registry()) {
-      registry->set_registry_for_active_window(NULL);
-    }
+  if (active) {
+    registry->set_registry_for_active_window(
+        browser_actions_->extension_keybinding_registry());
+  } else if (registry->registry_for_active_window() ==
+             browser_actions_->extension_keybinding_registry()) {
+    registry->set_registry_for_active_window(nullptr);
   }
 }
 
 void ToolbarView::Update(WebContents* tab) {
   if (location_bar_)
     location_bar_->Update(tab);
   if (browser_actions_)
     browser_actions_->RefreshToolbarActionViews();
   if (reload_)
     reload_->set_menu_enabled(chrome::IsDebuggerAttachedToCurrentTab(browser_));
@@ skipping 484 matching lines @@
 
 void ToolbarView::OnShowHomeButtonChanged() {
   Layout();
   SchedulePaint();
 }
 
 int ToolbarView::content_shadow_height() const {
   return browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH ?
       kContentShadowHeightAsh : kContentShadowHeight;
 }