OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/ui/cocoa/tab_dialogs_cocoa.h" | 5 #include "chrome/browser/ui/cocoa/tab_dialogs_cocoa.h" |
6 | 6 |
7 #include "base/memory/ptr_util.h" | 7 #include "base/memory/ptr_util.h" |
8 #import "chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h" | 8 #import "chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h" |
9 #import "chrome/browser/ui/cocoa/hung_renderer_controller.h" | 9 #import "chrome/browser/ui/cocoa/hung_renderer_controller.h" |
10 #import "chrome/browser/ui/cocoa/passwords/passwords_bubble_cocoa.h" | 10 #import "chrome/browser/ui/cocoa/passwords/passwords_bubble_cocoa.h" |
11 #import "chrome/browser/ui/cocoa/profiles/profile_signin_confirmation_dialog_coc
oa.h" | 11 #import "chrome/browser/ui/cocoa/profiles/profile_signin_confirmation_dialog_coc
oa.h" |
| 12 #include "chrome/browser/ui/cocoa/tab_dialogs_views_mac.h" |
12 #import "chrome/browser/ui/cocoa/validation_message_bubble_cocoa.h" | 13 #import "chrome/browser/ui/cocoa/validation_message_bubble_cocoa.h" |
13 #include "content/public/browser/web_contents.h" | 14 #include "content/public/browser/web_contents.h" |
| 15 #include "ui/base/material_design/material_design_controller.h" |
14 | 16 |
15 // static | 17 // static |
16 void TabDialogs::CreateForWebContents(content::WebContents* contents) { | 18 void TabDialogs::CreateForWebContents(content::WebContents* contents) { |
17 DCHECK(contents); | 19 DCHECK(contents); |
18 if (!FromWebContents(contents)) | 20 |
19 contents->SetUserData(UserDataKey(), new TabDialogsCocoa(contents)); | 21 if (!FromWebContents(contents)) { |
| 22 TabDialogs* tab_dialogs = |
| 23 ui::MaterialDesignController::IsSecondaryUiMaterial() |
| 24 ? new TabDialogsViewsMac(contents) |
| 25 : new TabDialogsCocoa(contents); |
| 26 contents->SetUserData(UserDataKey(), tab_dialogs); |
| 27 } |
20 } | 28 } |
21 | 29 |
22 TabDialogsCocoa::TabDialogsCocoa(content::WebContents* contents) | 30 TabDialogsCocoa::TabDialogsCocoa(content::WebContents* contents) |
23 : web_contents_(contents) { | 31 : web_contents_(contents) { |
24 DCHECK(contents); | 32 DCHECK(contents); |
25 } | 33 } |
26 | 34 |
27 TabDialogsCocoa::~TabDialogsCocoa() { | 35 TabDialogsCocoa::~TabDialogsCocoa() { |
28 } | 36 } |
29 | 37 |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
69 // The bubble is closed when it loses the focus. | 77 // The bubble is closed when it loses the focus. |
70 } | 78 } |
71 | 79 |
72 base::WeakPtr<ValidationMessageBubble> TabDialogsCocoa::ShowValidationMessage( | 80 base::WeakPtr<ValidationMessageBubble> TabDialogsCocoa::ShowValidationMessage( |
73 const gfx::Rect& anchor_in_root_view, | 81 const gfx::Rect& anchor_in_root_view, |
74 const base::string16& main_text, | 82 const base::string16& main_text, |
75 const base::string16& sub_text) { | 83 const base::string16& sub_text) { |
76 return (new ValidationMessageBubbleCocoa( | 84 return (new ValidationMessageBubbleCocoa( |
77 web_contents_, anchor_in_root_view, main_text, sub_text))->AsWeakPtr(); | 85 web_contents_, anchor_in_root_view, main_text, sub_text))->AsWeakPtr(); |
78 } | 86 } |
OLD | NEW |