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

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

Issue 2065803002: Make ChromeExtensionChooserDialog::ShowDialog work for MacViews (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments Created 4 years, 6 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/chooser_dialog_cocoa.h" 5 #import "chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa.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/chrome_extension_chooser_dialog.h" 11 #include "chrome/browser/extensions/chrome_extension_chooser_dialog.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/chooser_dialog_cocoa_controller.h" 15 #import "chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa_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 17
17 ChooserDialogCocoa::ChooserDialogCocoa(content::WebContents* web_contents, 18 ChooserDialogCocoa::ChooserDialogCocoa(content::WebContents* web_contents,
18 ChooserController* chooser_controller) 19 ChooserController* chooser_controller)
19 : web_contents_(web_contents), chooser_controller_(chooser_controller) { 20 : web_contents_(web_contents), chooser_controller_(chooser_controller) {
20 DCHECK(web_contents_); 21 DCHECK(web_contents_);
21 DCHECK(chooser_controller_); 22 DCHECK(chooser_controller_);
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 CreateAndShowWebModalDialogMac(this, web_contents_, sheet); 58 CreateAndShowWebModalDialogMac(this, web_contents_, sheet);
58 } 59 }
59 60
60 void ChooserDialogCocoa::Dismissed() { 61 void ChooserDialogCocoa::Dismissed() {
61 if (constrained_window_) 62 if (constrained_window_)
62 constrained_window_->CloseWebContentsModalDialog(); 63 constrained_window_->CloseWebContentsModalDialog();
63 } 64 }
64 65
65 void ChromeExtensionChooserDialog::ShowDialog( 66 void ChromeExtensionChooserDialog::ShowDialog(
66 ChooserController* chooser_controller) const { 67 ChooserController* chooser_controller) const {
68 if (chrome::ToolkitViewsWebUIDialogsEnabled())
69 return ChromeExtensionChooserDialog::ShowDialogImpl(chooser_controller);
70
67 web_modal::WebContentsModalDialogManager* manager = 71 web_modal::WebContentsModalDialogManager* manager =
68 web_modal::WebContentsModalDialogManager::FromWebContents(web_contents_); 72 web_modal::WebContentsModalDialogManager::FromWebContents(web_contents_);
69 if (manager) { 73 if (manager) {
70 // These objects will delete themselves when the dialog closes. 74 // These objects will delete themselves when the dialog closes.
71 ChooserDialogCocoa* chooser_dialog = 75 ChooserDialogCocoa* chooser_dialog =
72 new ChooserDialogCocoa(web_contents_, chooser_controller); 76 new ChooserDialogCocoa(web_contents_, chooser_controller);
73 chooser_dialog->ShowDialog(); 77 chooser_dialog->ShowDialog();
74 } 78 }
75 } 79 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698