chrome/browser/ui/cocoa/website_settings/website_settings_bubble_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/website_settings/website_settings_bubble_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/website_settings/permission_prompt_impl_views_mac.mm ('k') | chrome/browser/ui/javascript_dialogs/javascript_dialog_mac.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.mm

diff --git a/chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.mm b/chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.mm

index 79b908e526d3f82df78129ca3de8ac7770402947..23152e0571b63dcc83e1cd5ea6007143b4fb267c 100644

--- a/chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.mm

+++ b/chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.mm

@@ -42,6 +42,7 @@

#import "ui/base/cocoa/flipped_view.h"

#import "ui/base/cocoa/hover_image_button.h"

#include "ui/base/l10n/l10n_util.h"

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

#include "ui/base/resource/resource_bundle.h"

#import "ui/gfx/mac/coordinate_conversion.h"

#include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"

@@ -1156,7 +1157,7 @@ void WebsiteSettingsUIBridge::Show(

content::WebContents* web_contents,

const GURL& virtual_url,

const security_state::SecurityInfo& security_info) {

- if (chrome::ToolkitViewsWebUIDialogsEnabled()) {

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

chrome::ShowWebsiteSettingsBubbleViewsAtPoint(

gfx::ScreenPointFromNSPoint(AnchorPointForWindow(parent)), profile,

web_contents, virtual_url, security_info);