diff options
| author | vsevik@chromium.org <vsevik@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-12 13:07:11 +0000 |
|---|---|---|
| committer | vsevik@chromium.org <vsevik@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-12 13:07:11 +0000 |
| commit | b04cc78a7f6f0ef8e8d7d15033cd19e5c32c579a (patch) | |
| tree | 2cee6f9328509917caecf85c8e6ddb450a0d8421 /content/browser | |
| parent | 3f0fe5d075a185562ebaa540f062696d6e53e2a5 (diff) | |
| download | chromium_src-b04cc78a7f6f0ef8e8d7d15033cd19e5c32c579a.zip chromium_src-b04cc78a7f6f0ef8e8d7d15033cd19e5c32c579a.tar.gz chromium_src-b04cc78a7f6f0ef8e8d7d15033cd19e5c32c579a.tar.bz2 | |
Developer Tools should support javascript popup dialogs when in docked mode.
BUG=89036
TEST=Open Devtools on Devtools (in docked mode), run alert(1), observe alert dialog.
Review URL: http://codereview.chromium.org/7342007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92163 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser')
| -rw-r--r-- | content/browser/debugger/devtools_window.cc | 8 | ||||
| -rw-r--r-- | content/browser/debugger/devtools_window.h | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/content/browser/debugger/devtools_window.cc b/content/browser/debugger/devtools_window.cc index 1c4e7e6..c9bb9bf 100644 --- a/content/browser/debugger/devtools_window.cc +++ b/content/browser/debugger/devtools_window.cc @@ -569,3 +569,11 @@ DevToolsWindow* DevToolsWindow::AsDevToolsWindow( return NULL; return *it; } + +content::JavaScriptDialogCreator* DevToolsWindow::GetJavaScriptDialogCreator() { + if (inspected_tab_) { + return inspected_tab_->tab_contents()->delegate()-> + GetJavaScriptDialogCreator(); + } + return TabContentsDelegate::GetJavaScriptDialogCreator(); +} diff --git a/content/browser/debugger/devtools_window.h b/content/browser/debugger/devtools_window.h index e8af7eb..a67fc61 100644 --- a/content/browser/debugger/devtools_window.h +++ b/content/browser/debugger/devtools_window.h @@ -94,6 +94,7 @@ class DevToolsWindow virtual bool PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event, bool* is_keyboard_shortcut); virtual void HandleKeyboardEvent(const NativeWebKeyboardEvent& event); + virtual content::JavaScriptDialogCreator* GetJavaScriptDialogCreator(); virtual void FrameNavigating(const std::string& url) {} |