From 6fe37681decffe98d09682f52fd3b66cd90cafef Mon Sep 17 00:00:00 2001 From: andresantoso Date: Thu, 22 Jan 2015 17:19:51 -0800 Subject: [PATCH] Mac: Fix crash when opening Incognito window Regressed by https://crrev.com/de66e360e2a2944bdf71608726b19b3bf2a2a6ff. ExtensionCommandsGlobalRegistry::Get() returns null when incognito, add a check for it. BUG=450903 Review URL: https://codereview.chromium.org/822083004 Cr-Commit-Position: refs/heads/master@{#312726} --- chrome/browser/ui/cocoa/browser_window_controller.mm | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/chrome/browser/ui/cocoa/browser_window_controller.mm b/chrome/browser/ui/cocoa/browser_window_controller.mm index c22f121ed44b..5fde5b9a7d25 100644 --- a/chrome/browser/ui/cocoa/browser_window_controller.mm +++ b/chrome/browser/ui/cocoa/browser_window_controller.mm @@ -627,8 +627,12 @@ using content::WebContents; if ([self isInAnyFullscreenMode]) [floatingBarBackingView_ setNeedsDisplay:YES]; // Okay even if nil. - extensions::ExtensionCommandsGlobalRegistry::Get(browser_->profile())-> - set_registry_for_active_window(extension_keybinding_registry_.get()); + auto registry = + extensions::ExtensionCommandsGlobalRegistry::Get(browser_->profile()); + if (registry) { + registry->set_registry_for_active_window( + extension_keybinding_registry_.get()); + } } - (void)windowDidResignMain:(NSNotification*)notification { @@ -640,8 +644,10 @@ using content::WebContents; if ([self isInAnyFullscreenMode]) [floatingBarBackingView_ setNeedsDisplay:YES]; // Okay even if nil. - extensions::ExtensionCommandsGlobalRegistry::Get(browser_->profile())-> - set_registry_for_active_window(nullptr); + auto registry = + extensions::ExtensionCommandsGlobalRegistry::Get(browser_->profile()); + if (registry) + registry->set_registry_for_active_window(nullptr); } // Called when we are activated (when we gain focus). -- 2.11.4.GIT