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

Side by Side 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 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 #import "chrome/browser/ui/cocoa/extensions/device_permissions_dialog_controller .h" 5 #import "chrome/browser/ui/cocoa/extensions/device_permissions_dialog_controller .h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/location.h" 8 #include "base/location.h"
9 #include "base/single_thread_task_runner.h" 9 #include "base/single_thread_task_runner.h"
10 #include "base/threading/thread_task_runner_handle.h" 10 #include "base/threading/thread_task_runner_handle.h"
11 #include "chrome/browser/extensions/api/chrome_device_permissions_prompt.h" 11 #include "chrome/browser/extensions/api/chrome_device_permissions_prompt.h"
12 #include "chrome/browser/ui/browser_dialogs.h"
12 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_sh eet.h" 13 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_sh eet.h"
13 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_wi ndow.h" 14 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_wi ndow.h"
14 #import "chrome/browser/ui/cocoa/extensions/device_permissions_view_controller.h " 15 #import "chrome/browser/ui/cocoa/extensions/device_permissions_view_controller.h "
15 #include "components/web_modal/web_contents_modal_dialog_manager.h" 16 #include "components/web_modal/web_contents_modal_dialog_manager.h"
16 #include "device/usb/usb_device.h" 17 #include "device/usb/usb_device.h"
17 18
18 using extensions::DevicePermissionsPrompt; 19 using extensions::DevicePermissionsPrompt;
19 20
20 DevicePermissionsDialogController::DevicePermissionsDialogController( 21 DevicePermissionsDialogController::DevicePermissionsDialogController(
21 content::WebContents* web_contents, 22 content::WebContents* web_contents,
(...skipping 27 matching lines...) Expand all
49 [view_controller_ devicesChanged]; 50 [view_controller_ devicesChanged];
50 } 51 }
51 52
52 void DevicePermissionsDialogController::OnConstrainedWindowClosed( 53 void DevicePermissionsDialogController::OnConstrainedWindowClosed(
53 ConstrainedWindowMac* window) { 54 ConstrainedWindowMac* window) {
54 prompt_->Dismissed(); 55 prompt_->Dismissed();
55 base::ThreadTaskRunnerHandle::Get()->DeleteSoon(FROM_HERE, this); 56 base::ThreadTaskRunnerHandle::Get()->DeleteSoon(FROM_HERE, this);
56 } 57 }
57 58
58 void ChromeDevicePermissionsPrompt::ShowDialog() { 59 void ChromeDevicePermissionsPrompt::ShowDialog() {
60 if (chrome::ToolkitViewsWebUIDialogsEnabled())
61 return ChromeDevicePermissionsPrompt::ShowDialogViews();
tapted 2016/05/18 00:14:52 I can't decide whether this is cool or sneaky :).
59 web_modal::WebContentsModalDialogManager* manager = 62 web_modal::WebContentsModalDialogManager* manager =
60 web_modal::WebContentsModalDialogManager::FromWebContents(web_contents()); 63 web_modal::WebContentsModalDialogManager::FromWebContents(web_contents());
61 if (manager) { 64 if (manager) {
62 // These objects will delete themselves when the dialog closes. 65 // These objects will delete themselves when the dialog closes.
63 new DevicePermissionsDialogController(web_contents(), prompt()); 66 new DevicePermissionsDialogController(web_contents(), prompt());
64 } else { 67 } else {
65 base::ThreadTaskRunnerHandle::Get()->PostTask( 68 base::ThreadTaskRunnerHandle::Get()->PostTask(
66 FROM_HERE, 69 FROM_HERE,
67 base::Bind(&DevicePermissionsPrompt::Prompt::Dismissed, prompt())); 70 base::Bind(&DevicePermissionsPrompt::Prompt::Dismissed, prompt()));
68 } 71 }
69 } 72 }
OLDNEW
« 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