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

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

Issue 2632653002: MacViews: Enable views based External Protocol dialog behind secondary-ui-md flag. (Closed)
Patch Set: Fix chromeos Created 3 years, 11 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/browser_dialogs.h" 5 #include "chrome/browser/ui/browser_dialogs.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "chrome/browser/chooser_controller/chooser_controller.h" 9 #include "chrome/browser/chooser_controller/chooser_controller.h"
10 #include "chrome/browser/extensions/api/chrome_device_permissions_prompt.h" 10 #include "chrome/browser/extensions/api/chrome_device_permissions_prompt.h"
11 #include "chrome/browser/extensions/chrome_extension_chooser_dialog.h" 11 #include "chrome/browser/extensions/chrome_extension_chooser_dialog.h"
12 #include "chrome/browser/extensions/extension_install_prompt.h" 12 #include "chrome/browser/extensions/extension_install_prompt.h"
13 #include "chrome/browser/external_protocol/external_protocol_handler.h"
13 #include "chrome/browser/ui/login/login_handler.h" 14 #include "chrome/browser/ui/login/login_handler.h"
14 #include "chrome/browser/ui/views/task_manager_view.h" 15 #include "chrome/browser/ui/views/task_manager_view.h"
15 16
16 #if defined(OS_CHROMEOS) 17 #if defined(OS_CHROMEOS)
17 #include "chrome/browser/ui/views/intent_picker_bubble_view.h" 18 #include "chrome/browser/ui/views/intent_picker_bubble_view.h"
18 #endif // OS_CHROMEOS 19 #endif // OS_CHROMEOS
19 20
20 // This file provides definitions of desktop browser dialog-creation methods for 21 // This file provides definitions of desktop browser dialog-creation methods for
21 // all toolkit-views platforms other than Mac. It also provides the definitions 22 // all toolkit-views platforms other than Mac. It also provides the definitions
22 // on Mac when mac_views_browser=1 is specified in GYP_DEFINES. The file is 23 // on Mac when mac_views_browser=1 is specified in GYP_DEFINES. The file is
(...skipping 10 matching lines...) Expand all
33 // static 34 // static
34 void BookmarkEditor::Show(gfx::NativeWindow parent_window, 35 void BookmarkEditor::Show(gfx::NativeWindow parent_window,
35 Profile* profile, 36 Profile* profile,
36 const EditDetails& details, 37 const EditDetails& details,
37 Configuration configuration) { 38 Configuration configuration) {
38 chrome::ShowBookmarkEditorViews(parent_window, profile, details, 39 chrome::ShowBookmarkEditorViews(parent_window, profile, details,
39 configuration); 40 configuration);
40 } 41 }
41 42
42 // static 43 // static
44 void ExternalProtocolHandler::RunExternalProtocolDialog(
45 const GURL& url,
46 int render_process_host_id,
47 int routing_id,
48 ui::PageTransition page_transition,
49 bool has_user_gesture) {
50 chrome::RunExternalProtocolDialogViews(url, render_process_host_id,
51 routing_id, page_transition,
52 has_user_gesture);
53 }
54
55 // static
43 ExtensionInstallPrompt::ShowDialogCallback 56 ExtensionInstallPrompt::ShowDialogCallback
44 ExtensionInstallPrompt::GetDefaultShowDialogCallback() { 57 ExtensionInstallPrompt::GetDefaultShowDialogCallback() {
45 return ExtensionInstallPrompt::GetViewsShowDialogCallback(); 58 return ExtensionInstallPrompt::GetViewsShowDialogCallback();
46 } 59 }
47 60
48 void ChromeDevicePermissionsPrompt::ShowDialog() { 61 void ChromeDevicePermissionsPrompt::ShowDialog() {
49 ShowDialogViews(); 62 ShowDialogViews();
50 } 63 }
51 64
52 void ChromeExtensionChooserDialog::ShowDialog( 65 void ChromeExtensionChooserDialog::ShowDialog(
(...skipping 13 matching lines...) Expand all
66 79
67 } // namespace chrome 80 } // namespace chrome
68 81
69 #if defined(OS_CHROMEOS) 82 #if defined(OS_CHROMEOS)
70 83
71 BubbleShowPtr ShowIntentPickerBubble() { 84 BubbleShowPtr ShowIntentPickerBubble() {
72 return IntentPickerBubbleView::ShowBubble; 85 return IntentPickerBubbleView::ShowBubble;
73 } 86 }
74 87
75 #endif // OS_CHROMEOS 88 #endif // OS_CHROMEOS
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698