| Index: chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc
|
| diff --git a/chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc b/chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc
|
| index 6eb9dcc1f5ba1bb527ab841eab3fab528e0d94df..02f6ff2badd1005e2aba8725cc2ede8b01464fcc 100644
|
| --- a/chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc
|
| +++ b/chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc
|
| @@ -4,6 +4,7 @@
|
|
|
| #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h"
|
|
|
| +#include "chrome/browser/ui/app_modal_dialogs/chrome_javascript_dialog_manager_client.h"
|
| #include "chrome/browser/ui/views/chrome_constrained_window_views_client.h"
|
| #include "chrome/browser/ui/views/chrome_views_delegate.h"
|
| #include "components/constrained_window/constrained_window_views.h"
|
| @@ -16,7 +17,8 @@ ChromeBrowserMainExtraPartsViews::ChromeBrowserMainExtraPartsViews() {
|
| }
|
|
|
| ChromeBrowserMainExtraPartsViews::~ChromeBrowserMainExtraPartsViews() {
|
| - SetConstrainedWindowViewsClient(scoped_ptr<ConstrainedWindowViewsClient>());
|
| + SetJavaScriptDialogManagerClient(nullptr);
|
| + SetConstrainedWindowViewsClient(nullptr);
|
| }
|
|
|
| void ChromeBrowserMainExtraPartsViews::ToolkitInitialized() {
|
| @@ -24,8 +26,9 @@ void ChromeBrowserMainExtraPartsViews::ToolkitInitialized() {
|
| // display the correct icon.
|
| if (!views::ViewsDelegate::views_delegate)
|
| views::ViewsDelegate::views_delegate = new ChromeViewsDelegate;
|
| -
|
| SetConstrainedWindowViewsClient(CreateChromeConstrainedWindowViewsClient());
|
| + SetJavaScriptDialogManagerClient(
|
| + make_scoped_ptr(new ChromeJavaScriptDialogManagerClient));
|
|
|
| #if defined(USE_AURA)
|
| wm_state_.reset(new wm::WMState);
|
|
|