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

Side by Side Diff: chrome/browser/ui/views/chrome_javascript_native_dialog_factory_views.cc

Issue 688853005: Consolidate javascript_dialog_manager.h and javascript_dialog_manager_impl.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/app_modal_dialogs/chrome_javascript_native_dialog_fa ctory.h" 5 #include "chrome/browser/ui/app_modal_dialogs/chrome_javascript_native_dialog_fa ctory.h"
6 6
7 #include "components/app_modal_dialogs/javascript_dialog_manager.h" 7 #include "components/app_modal_dialogs/javascript_dialog_manager.h"
8 #include "components/app_modal_dialogs/javascript_native_dialog_factory.h" 8 #include "components/app_modal_dialogs/javascript_native_dialog_factory.h"
9 #include "components/constrained_window/constrained_window_views.h" 9 #include "components/constrained_window/constrained_window_views.h"
10 10
(...skipping 24 matching lines...) Expand all
35 CreateBrowserModalDialogViews(d, parent_window); 35 CreateBrowserModalDialogViews(d, parent_window);
36 return d; 36 return d;
37 } 37 }
38 38
39 DISALLOW_COPY_AND_ASSIGN(ChromeJavaScriptNativeDialogViewsFactory); 39 DISALLOW_COPY_AND_ASSIGN(ChromeJavaScriptNativeDialogViewsFactory);
40 }; 40 };
41 41
42 } // namespace 42 } // namespace
43 43
44 void InstallChromeJavaScriptNativeDialogFactory() { 44 void InstallChromeJavaScriptNativeDialogFactory() {
45 SetJavaScriptNativeDialogFactory( 45 JavaScriptDialogManager::GetInstance()->SetNativeDialogFactory(
46 make_scoped_ptr(new ChromeJavaScriptNativeDialogViewsFactory)); 46 make_scoped_ptr(new ChromeJavaScriptNativeDialogViewsFactory));
47 } 47 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698