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 #include "chrome/browser/ui/cocoa/tab_dialogs_views_mac.h" |
13 #import "chrome/browser/ui/cocoa/validation_message_bubble_cocoa.h" | 13 #import "chrome/browser/ui/cocoa/validation_message_bubble_cocoa.h" |
| 14 #include "chrome/browser/ui/sync/profile_signin_confirmation_helper.h" |
14 #include "content/public/browser/web_contents.h" | 15 #include "content/public/browser/web_contents.h" |
15 #include "ui/base/material_design/material_design_controller.h" | 16 #include "ui/base/material_design/material_design_controller.h" |
16 | 17 |
17 // static | 18 // static |
18 void TabDialogs::CreateForWebContents(content::WebContents* contents) { | 19 void TabDialogs::CreateForWebContents(content::WebContents* contents) { |
19 DCHECK(contents); | 20 DCHECK(contents); |
20 | 21 |
21 if (!FromWebContents(contents)) { | 22 if (!FromWebContents(contents)) { |
22 TabDialogs* tab_dialogs = | 23 TabDialogs* tab_dialogs = |
23 ui::MaterialDesignController::IsSecondaryUiMaterial() | 24 ui::MaterialDesignController::IsSecondaryUiMaterial() |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
57 } | 58 } |
58 | 59 |
59 void TabDialogsCocoa::HideHungRendererDialog() { | 60 void TabDialogsCocoa::HideHungRendererDialog() { |
60 [HungRendererController endForWebContents:web_contents_]; | 61 [HungRendererController endForWebContents:web_contents_]; |
61 } | 62 } |
62 | 63 |
63 void TabDialogsCocoa::ShowProfileSigninConfirmation( | 64 void TabDialogsCocoa::ShowProfileSigninConfirmation( |
64 Browser* browser, | 65 Browser* browser, |
65 Profile* profile, | 66 Profile* profile, |
66 const std::string& username, | 67 const std::string& username, |
67 ui::ProfileSigninConfirmationDelegate* delegate) { | 68 std::unique_ptr<ui::ProfileSigninConfirmationDelegate> delegate) { |
68 ProfileSigninConfirmationDialogCocoa::Show( | 69 ProfileSigninConfirmationDialogCocoa::Show(browser, web_contents_, profile, |
69 browser, web_contents_, profile, username, delegate); | 70 username, std::move(delegate)); |
70 } | 71 } |
71 | 72 |
72 void TabDialogsCocoa::ShowManagePasswordsBubble(bool user_action) { | 73 void TabDialogsCocoa::ShowManagePasswordsBubble(bool user_action) { |
73 ManagePasswordsBubbleCocoa::Show(web_contents_, user_action); | 74 ManagePasswordsBubbleCocoa::Show(web_contents_, user_action); |
74 } | 75 } |
75 | 76 |
76 void TabDialogsCocoa::HideManagePasswordsBubble() { | 77 void TabDialogsCocoa::HideManagePasswordsBubble() { |
77 // The bubble is closed when it loses the focus. | 78 // The bubble is closed when it loses the focus. |
78 } | 79 } |
79 | 80 |
80 base::WeakPtr<ValidationMessageBubble> TabDialogsCocoa::ShowValidationMessage( | 81 base::WeakPtr<ValidationMessageBubble> TabDialogsCocoa::ShowValidationMessage( |
81 const gfx::Rect& anchor_in_root_view, | 82 const gfx::Rect& anchor_in_root_view, |
82 const base::string16& main_text, | 83 const base::string16& main_text, |
83 const base::string16& sub_text) { | 84 const base::string16& sub_text) { |
84 return (new ValidationMessageBubbleCocoa( | 85 return (new ValidationMessageBubbleCocoa( |
85 web_contents_, anchor_in_root_view, main_text, sub_text))->AsWeakPtr(); | 86 web_contents_, anchor_in_root_view, main_text, sub_text))->AsWeakPtr(); |
86 } | 87 } |
OLD | NEW |