diff options
| author | dgozman <dgozman@chromium.org> | 2015-04-17 10:01:21 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-17 17:01:36 +0000 |
| commit | b91be0ebbb4f38e76201c665a47fb1c562c8aa16 (patch) | |
| tree | f39719117c8eacc0afe3e55eab98d41e6ed8fd98 | |
| parent | 457659a06b2fe2e60005f48653492951d89cc409 (diff) | |
| download | chromium_src-b91be0ebbb4f38e76201c665a47fb1c562c8aa16.zip chromium_src-b91be0ebbb4f38e76201c665a47fb1c562c8aa16.tar.gz chromium_src-b91be0ebbb4f38e76201c665a47fb1c562c8aa16.tar.bz2 | |
[DevTools] Fix crash in DevToolsWindow::ActivateContents.
BUG=475484
Review URL: https://codereview.chromium.org/1057553004
Cr-Commit-Position: refs/heads/master@{#325655}
| -rw-r--r-- | chrome/browser/devtools/devtools_window.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/devtools/devtools_window.cc b/chrome/browser/devtools/devtools_window.cc index 5df0546..5706f4a 100644 --- a/chrome/browser/devtools/devtools_window.cc +++ b/chrome/browser/devtools/devtools_window.cc @@ -840,7 +840,8 @@ WebContents* DevToolsWindow::OpenURLFromTab( void DevToolsWindow::ActivateContents(WebContents* contents) { if (is_docked_) { WebContents* inspected_tab = GetInspectedWebContents(); - inspected_tab->GetDelegate()->ActivateContents(inspected_tab); + if (inspected_tab) + inspected_tab->GetDelegate()->ActivateContents(inspected_tab); } else if (browser_) { browser_->window()->Activate(); } |