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

Unified Diff: chrome/browser/ui/cocoa/extensions/device_permissions_dialog_controller.mm

Issue 1989543002: MacViews: support Views device permission prompt (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 7 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/cocoa/extensions/device_permissions_dialog_controller.mm
diff --git a/chrome/browser/ui/cocoa/extensions/device_permissions_dialog_controller.mm b/chrome/browser/ui/cocoa/extensions/device_permissions_dialog_controller.mm
index c38fa70d03fcd1d8a7c1b8e7903aa75ec5211954..852fbba7969c8be8e7451cd09e513bb0895e0e97 100644
--- a/chrome/browser/ui/cocoa/extensions/device_permissions_dialog_controller.mm
+++ b/chrome/browser/ui/cocoa/extensions/device_permissions_dialog_controller.mm
@@ -9,6 +9,7 @@
#include "base/single_thread_task_runner.h"
#include "base/threading/thread_task_runner_handle.h"
#include "chrome/browser/extensions/api/chrome_device_permissions_prompt.h"
+#include "chrome/browser/ui/browser_dialogs.h"
#import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_sheet.h"
#import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_window.h"
#import "chrome/browser/ui/cocoa/extensions/device_permissions_view_controller.h"
@@ -56,6 +57,8 @@ void DevicePermissionsDialogController::OnConstrainedWindowClosed(
}
void ChromeDevicePermissionsPrompt::ShowDialog() {
+ if (chrome::ToolkitViewsWebUIDialogsEnabled())
+ return ChromeDevicePermissionsPrompt::ShowDialogViews();
tapted 2016/05/18 00:14:52 I can't decide whether this is cool or sneaky :).
web_modal::WebContentsModalDialogManager* manager =
web_modal::WebContentsModalDialogManager::FromWebContents(web_contents());
if (manager) {
« no previous file with comments | « chrome/browser/extensions/api/chrome_device_permissions_prompt.h ('k') | chrome/browser/ui/views/browser_dialogs_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698