chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller.mm - Issue 2524213002: MacViews: Consolidate flags. Just use --secondary-ui-md to enable MacViews.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller.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

« no previous file with comments | « chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa.mm ('k') | chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller.mm

diff --git a/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller.mm b/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller.mm

index 4695a3904ab2968f56fa9542647565ee81648e68..116284fbbd082114cfb3d7a5df1ef432a951a6be 100644

--- a/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller.mm

+++ b/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller.mm

@@ -14,13 +14,13 @@

#include "chrome/browser/extensions/api/experience_sampling_private/experience_sampling.h"

#include "chrome/browser/extensions/extension_install_prompt_show_params.h"

#include "chrome/browser/ui/browser.h"

-#include "chrome/browser/ui/browser_dialogs.h"

#include "chrome/browser/ui/browser_finder.h"

#import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_sheet.h"

#include "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_window.h"

#import "chrome/browser/ui/cocoa/extensions/windowed_install_dialog_controller.h"

#include "chrome/browser/ui/tabs/tab_strip_model.h"

#include "content/public/browser/web_contents.h"

+#include "ui/base/material_design/material_design_controller.h"

using extensions::ExperienceSamplingEvent;

@@ -113,7 +113,7 @@ void ExtensionInstallDialogController::OnPromptButtonClicked(

// static

ExtensionInstallPrompt::ShowDialogCallback

ExtensionInstallPrompt::GetDefaultShowDialogCallback() {

- if (chrome::ToolkitViewsWebUIDialogsEnabled())

+ if (ui::MaterialDesignController::IsSecondaryUiMaterial())

return ExtensionInstallPrompt::GetViewsShowDialogCallback();

return base::Bind(&ShowExtensionInstallDialogImpl);

}