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

Side by Side 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, 1 month 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h" 5 #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h"
6 6
7 #include "chrome/browser/ui/app_modal_dialogs/chrome_javascript_dialog_manager_c lient.h"
7 #include "chrome/browser/ui/views/chrome_constrained_window_views_client.h" 8 #include "chrome/browser/ui/views/chrome_constrained_window_views_client.h"
8 #include "chrome/browser/ui/views/chrome_views_delegate.h" 9 #include "chrome/browser/ui/views/chrome_views_delegate.h"
9 #include "components/constrained_window/constrained_window_views.h" 10 #include "components/constrained_window/constrained_window_views.h"
10 11
11 #if defined(USE_AURA) 12 #if defined(USE_AURA)
12 #include "ui/wm/core/wm_state.h" 13 #include "ui/wm/core/wm_state.h"
13 #endif 14 #endif
14 15
15 ChromeBrowserMainExtraPartsViews::ChromeBrowserMainExtraPartsViews() { 16 ChromeBrowserMainExtraPartsViews::ChromeBrowserMainExtraPartsViews() {
16 } 17 }
17 18
18 ChromeBrowserMainExtraPartsViews::~ChromeBrowserMainExtraPartsViews() { 19 ChromeBrowserMainExtraPartsViews::~ChromeBrowserMainExtraPartsViews() {
19 SetConstrainedWindowViewsClient(scoped_ptr<ConstrainedWindowViewsClient>()); 20 SetJavaScriptDialogManagerClient(nullptr);
21 SetConstrainedWindowViewsClient(nullptr);
20 } 22 }
21 23
22 void ChromeBrowserMainExtraPartsViews::ToolkitInitialized() { 24 void ChromeBrowserMainExtraPartsViews::ToolkitInitialized() {
23 // The delegate needs to be set before any UI is created so that windows 25 // The delegate needs to be set before any UI is created so that windows
24 // display the correct icon. 26 // display the correct icon.
25 if (!views::ViewsDelegate::views_delegate) 27 if (!views::ViewsDelegate::views_delegate)
26 views::ViewsDelegate::views_delegate = new ChromeViewsDelegate; 28 views::ViewsDelegate::views_delegate = new ChromeViewsDelegate;
27
28 SetConstrainedWindowViewsClient(CreateChromeConstrainedWindowViewsClient()); 29 SetConstrainedWindowViewsClient(CreateChromeConstrainedWindowViewsClient());
30 SetJavaScriptDialogManagerClient(
31 make_scoped_ptr(new ChromeJavaScriptDialogManagerClient));
29 32
30 #if defined(USE_AURA) 33 #if defined(USE_AURA)
31 wm_state_.reset(new wm::WMState); 34 wm_state_.reset(new wm::WMState);
32 #endif 35 #endif
33 } 36 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698