Chromium Code Reviews| Index: content/browser/debugger/devtools_window.cc |
| diff --git a/content/browser/debugger/devtools_window.cc b/content/browser/debugger/devtools_window.cc |
| index ba633243a70139c39ad1e464e43ead12f04f45bc..266191a55d6ea27ad236453977cf7bbdc42fa95c 100644 |
| --- a/content/browser/debugger/devtools_window.cc |
| +++ b/content/browser/debugger/devtools_window.cc |
| @@ -74,6 +74,11 @@ DevToolsWindow* DevToolsWindow::FindDevToolsWindow( |
| } |
| // static |
| +DevToolsWindow* DevToolsWindow::CreateDevToolsWindow(Profile* profile) { |
|
pfeldman
2011/07/08 09:17:17
CreateDevToolsWindowForWorker
yurys
2011/07/08 15:35:53
Done.
|
| + return new DevToolsWindow(profile, NULL, false); |
| +} |
| + |
| +// static |
| DevToolsWindow* DevToolsWindow::OpenDevToolsWindow( |
| RenderViewHost* inspected_rvh) { |
| return ToggleDevToolsWindow(inspected_rvh, true, |
| @@ -130,10 +135,12 @@ DevToolsWindow::DevToolsWindow(Profile* profile, |
| this, |
| NotificationType::BROWSER_THEME_CHANGED, |
| Source<ThemeService>(ThemeServiceFactory::GetForProfile(profile_))); |
| - TabContents* tab = inspected_rvh->delegate()->GetAsTabContents(); |
| - if (tab) |
| - inspected_tab_ = TabContentsWrapper::GetCurrentWrapperForContents(tab); |
| - |
| + // There is now inspected_rvh in case of shared workers. |
| + if (inspected_rvh) { |
| + TabContents* tab = inspected_rvh->delegate()->GetAsTabContents(); |
| + if (tab) |
| + inspected_tab_ = TabContentsWrapper::GetCurrentWrapperForContents(tab); |
| + } |
| instances_.push_back(this); |
| } |