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

Unified Diff: chrome/browser/ui/cocoa/tab_dialogs_cocoa.mm

Issue 2534743002: MacViews: Harmony for TabDialogs' dialogs (starting with Collected Cookies) (Closed)
Patch Set: Move browsertest to chrome/browser/ui + similarity=20% Created 3 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/cocoa/tab_dialogs_cocoa.h ('k') | chrome/browser/ui/cocoa/tab_dialogs_views_mac.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/tab_dialogs_cocoa.mm
diff --git a/chrome/browser/ui/cocoa/tab_dialogs_cocoa.mm b/chrome/browser/ui/cocoa/tab_dialogs_cocoa.mm
index e70c579cb16db23e020df1c2c30ab719f2f51978..bc20ecf6ea6868439825f9ddee13da149bf735da 100644
--- a/chrome/browser/ui/cocoa/tab_dialogs_cocoa.mm
+++ b/chrome/browser/ui/cocoa/tab_dialogs_cocoa.mm
@@ -9,14 +9,22 @@
#import "chrome/browser/ui/cocoa/hung_renderer_controller.h"
#import "chrome/browser/ui/cocoa/passwords/passwords_bubble_cocoa.h"
#import "chrome/browser/ui/cocoa/profiles/profile_signin_confirmation_dialog_cocoa.h"
+#include "chrome/browser/ui/cocoa/tab_dialogs_views_mac.h"
#import "chrome/browser/ui/cocoa/validation_message_bubble_cocoa.h"
#include "content/public/browser/web_contents.h"
+#include "ui/base/material_design/material_design_controller.h"
// static
void TabDialogs::CreateForWebContents(content::WebContents* contents) {
DCHECK(contents);
- if (!FromWebContents(contents))
- contents->SetUserData(UserDataKey(), new TabDialogsCocoa(contents));
+
+ if (!FromWebContents(contents)) {
+ TabDialogs* tab_dialogs =
+ ui::MaterialDesignController::IsSecondaryUiMaterial()
+ ? new TabDialogsViewsMac(contents)
+ : new TabDialogsCocoa(contents);
+ contents->SetUserData(UserDataKey(), tab_dialogs);
+ }
}
TabDialogsCocoa::TabDialogsCocoa(content::WebContents* contents)
« no previous file with comments | « chrome/browser/ui/cocoa/tab_dialogs_cocoa.h ('k') | chrome/browser/ui/cocoa/tab_dialogs_views_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698