Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1153)

Unified Diff: chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc

Issue 666533007: Move JavaScriptDialogManager, JavascriptAppModalDialogViews to components/app_modal_dialogs (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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);

Powered by Google App Engine
This is Rietveld 408576698