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

Unified Diff: chrome/browser/ui/cocoa/website_settings/permission_prompt_impl_views_mac.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/website_settings/permission_prompt_impl_views_mac.mm
diff --git a/chrome/browser/ui/cocoa/website_settings/permission_prompt_impl_views_mac.mm b/chrome/browser/ui/cocoa/website_settings/permission_prompt_impl_views_mac.mm
index 469f9cc6c3fe752d1f3da50f76b4ceb92868d787..cfd0f53a3147f5e16635fdce461f1b796ad296df 100644
--- a/chrome/browser/ui/cocoa/website_settings/permission_prompt_impl_views_mac.mm
+++ b/chrome/browser/ui/cocoa/website_settings/permission_prompt_impl_views_mac.mm
@@ -4,7 +4,6 @@
#include "base/memory/ptr_util.h"
#include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/browser_dialogs.h"
#include "chrome/browser/ui/browser_finder.h"
#include "chrome/browser/ui/browser_window.h"
#import "chrome/browser/ui/cocoa/browser_window_controller.h"
@@ -13,6 +12,7 @@
#import "chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.h"
#include "chrome/browser/ui/views/website_settings/permission_prompt_impl.h"
#import "ui/base/cocoa/cocoa_base_utils.h"
+#include "ui/base/material_design/material_design_controller.h"
#import "ui/gfx/mac/coordinate_conversion.h"
// Implementation of PermissionPromptImpl's anchor methods for Cocoa
@@ -35,9 +35,10 @@ views::BubbleBorder::Arrow PermissionPromptImpl::GetAnchorArrow() {
// static
std::unique_ptr<PermissionPrompt> PermissionPrompt::Create(
content::WebContents* web_contents) {
- if (chrome::ToolkitViewsWebUIDialogsEnabled())
+ if (ui::MaterialDesignController::IsSecondaryUiMaterial()) {
return base::WrapUnique(new PermissionPromptImpl(
chrome::FindBrowserWithWebContents(web_contents)));
+ }
return base::MakeUnique<PermissionBubbleCocoa>(
chrome::FindBrowserWithWebContents(web_contents));
}

Powered by Google App Engine
This is Rietveld 408576698