Chromium Code Reviews| Index: chrome/browser/ui/views/chrome_web_dialog_view.cc |
| diff --git a/chrome/browser/ui/views/chrome_web_dialog_view.cc b/chrome/browser/ui/views/chrome_web_dialog_view.cc |
| index c73f6eafe05706917ad25cb37dbe583c12fa0f23..b1a651ccb638592f48e90828774f6faffc7ee2c5 100644 |
| --- a/chrome/browser/ui/views/chrome_web_dialog_view.cc |
| +++ b/chrome/browser/ui/views/chrome_web_dialog_view.cc |
| @@ -2,6 +2,7 @@ |
| // Use of this source code is governed by a BSD-style license that can be |
| // found in the LICENSE file. |
| +#include "chrome/browser/extensions/chrome_extension_web_contents_observer.h" |
| #include "chrome/browser/ui/browser_dialogs.h" |
| #include "chrome/browser/ui/webui/chrome_web_contents_handler.h" |
| #include "ui/views/controls/webview/web_dialog_view.h" |
| @@ -14,20 +15,20 @@ gfx::NativeWindow ShowWebDialog(gfx::NativeWindow parent, |
| content::BrowserContext* context, |
| ui::WebDialogDelegate* delegate) { |
| views::Widget* widget = NULL; |
| + views::WebDialogView* view = |
| + new views::WebDialogView(context, delegate, new ChromeWebContentsHandler); |
| if (parent) { |
| - widget = views::Widget::CreateWindowWithParent( |
| - new views::WebDialogView(context, |
| - delegate, |
| - new ChromeWebContentsHandler), |
| - parent); |
| + widget = views::Widget::CreateWindowWithParent(view, parent); |
| } else { |
| // We shouldn't be called with a NULL parent, but sometimes are. |
| - widget = views::Widget::CreateWindow( |
| - new views::WebDialogView(context, |
| - delegate, |
| - new ChromeWebContentsHandler)); |
| + widget = views::Widget::CreateWindow(view); |
| } |
| + // Observer is needed for ChromeVox extension to send messages between content |
|
msw
2014/04/28 18:32:45
Are there security concerns with enabling extensio
dzhioev (left Google)
2014/04/28 19:15:53
Creating ChromeExtensionWebContentsObserver makes
dmazzoni
2014/05/22 16:39:52
Thanks for the ping.
Confirmed - just adding a Ch
|
| + // and background scripts. |
| + extensions::ChromeExtensionWebContentsObserver::CreateForWebContents( |
| + view->web_contents()); |
| + |
| widget->Show(); |
| return widget->GetNativeWindow(); |
| } |