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

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

Issue 2524213002: MacViews: Consolidate flags. Just use --secondary-ui-md to enable MacViews. (Closed)
Patch Set: rebase for r435075 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa.mm
diff --git a/chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa.mm b/chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa.mm
index 21c71222acbd9776214560973b71dea92ec569c9..4c3889961755a7f665bcbf7a78ecad9dd47ea591 100644
--- a/chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa.mm
+++ b/chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa.mm
@@ -12,11 +12,11 @@
#include "chrome/browser/extensions/api/chrome_device_permissions_prompt.h"
#include "chrome/browser/extensions/chrome_extension_chooser_dialog.h"
#include "chrome/browser/extensions/device_permissions_dialog_controller.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/chooser_dialog_cocoa_controller.h"
#include "components/web_modal/web_contents_modal_dialog_manager.h"
+#include "ui/base/material_design/material_design_controller.h"
ChooserDialogCocoa::ChooserDialogCocoa(
content::WebContents* web_contents,
@@ -53,9 +53,10 @@ void ChooserDialogCocoa::Dismissed() {
void ChromeExtensionChooserDialog::ShowDialog(
std::unique_ptr<ChooserController> chooser_controller) const {
- if (chrome::ToolkitViewsWebUIDialogsEnabled())
+ if (ui::MaterialDesignController::IsSecondaryUiMaterial()) {
return ChromeExtensionChooserDialog::ShowDialogImpl(
std::move(chooser_controller));
+ }
web_modal::WebContentsModalDialogManager* manager =
web_modal::WebContentsModalDialogManager::FromWebContents(web_contents_);
@@ -68,7 +69,7 @@ void ChromeExtensionChooserDialog::ShowDialog(
}
void ChromeDevicePermissionsPrompt::ShowDialog() {
- if (chrome::ToolkitViewsWebUIDialogsEnabled())
+ if (ui::MaterialDesignController::IsSecondaryUiMaterial())
return ChromeDevicePermissionsPrompt::ShowDialogViews();
std::unique_ptr<ChooserController> chooser_controller(

Powered by Google App Engine
This is Rietveld 408576698