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

Side by Side Diff: chrome/browser/ui/cocoa/extensions/device_permissions_dialog_controller.mm

Issue 2524213002: MacViews: Consolidate flags. Just use --secondary-ui-md to enable MacViews. (Closed)
Patch Set: remove obsolete comment from r409593 Created 4 years 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"
13 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_sh eet.h" 12 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_sh eet.h"
14 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_wi ndow.h" 13 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_wi ndow.h"
15 #import "chrome/browser/ui/cocoa/extensions/device_permissions_view_controller.h " 14 #import "chrome/browser/ui/cocoa/extensions/device_permissions_view_controller.h "
16 #include "components/web_modal/web_contents_modal_dialog_manager.h" 15 #include "components/web_modal/web_contents_modal_dialog_manager.h"
17 #include "device/usb/usb_device.h" 16 #include "device/usb/usb_device.h"
17 #include "ui/base/material_design/material_design_controller.h"
18 18
19 using extensions::DevicePermissionsPrompt; 19 using extensions::DevicePermissionsPrompt;
20 20
21 DevicePermissionsDialogController::DevicePermissionsDialogController( 21 DevicePermissionsDialogController::DevicePermissionsDialogController(
22 content::WebContents* web_contents, 22 content::WebContents* web_contents,
23 scoped_refptr<DevicePermissionsPrompt::Prompt> prompt) 23 scoped_refptr<DevicePermissionsPrompt::Prompt> prompt)
24 : prompt_(prompt) { 24 : prompt_(prompt) {
25 view_controller_.reset( 25 view_controller_.reset(
26 [[DevicePermissionsViewController alloc] initWithController:this 26 [[DevicePermissionsViewController alloc] initWithController:this
27 prompt:prompt]); 27 prompt:prompt]);
(...skipping 22 matching lines...) Expand all
50 [view_controller_ devicesChanged]; 50 [view_controller_ devicesChanged];
51 } 51 }
52 52
53 void DevicePermissionsDialogController::OnConstrainedWindowClosed( 53 void DevicePermissionsDialogController::OnConstrainedWindowClosed(
54 ConstrainedWindowMac* window) { 54 ConstrainedWindowMac* window) {
55 prompt_->Dismissed(); 55 prompt_->Dismissed();
56 base::ThreadTaskRunnerHandle::Get()->DeleteSoon(FROM_HERE, this); 56 base::ThreadTaskRunnerHandle::Get()->DeleteSoon(FROM_HERE, this);
57 } 57 }
58 58
59 void ChromeDevicePermissionsPrompt::ShowDialog() { 59 void ChromeDevicePermissionsPrompt::ShowDialog() {
60 if (chrome::ToolkitViewsWebUIDialogsEnabled()) 60 if (ui::MaterialDesignController::IsSecondaryUiMaterial())
61 return ChromeDevicePermissionsPrompt::ShowDialogViews(); 61 return ChromeDevicePermissionsPrompt::ShowDialogViews();
62 web_modal::WebContentsModalDialogManager* manager = 62 web_modal::WebContentsModalDialogManager* manager =
63 web_modal::WebContentsModalDialogManager::FromWebContents(web_contents()); 63 web_modal::WebContentsModalDialogManager::FromWebContents(web_contents());
64 if (manager) { 64 if (manager) {
65 // These objects will delete themselves when the dialog closes. 65 // These objects will delete themselves when the dialog closes.
66 new DevicePermissionsDialogController(web_contents(), prompt()); 66 new DevicePermissionsDialogController(web_contents(), prompt());
67 } else { 67 } else {
68 base::ThreadTaskRunnerHandle::Get()->PostTask( 68 base::ThreadTaskRunnerHandle::Get()->PostTask(
69 FROM_HERE, 69 FROM_HERE,
70 base::Bind(&DevicePermissionsPrompt::Prompt::Dismissed, prompt())); 70 base::Bind(&DevicePermissionsPrompt::Prompt::Dismissed, prompt()));
71 } 71 }
72 } 72 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698