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

Side by Side Diff: chrome/browser/ui/cocoa/tab_dialogs_cocoa.mm

Issue 867323005: MacViews: Fix duplicate definition of ValidationMessageBubble::ShowAndCreate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@FirstResponder
Patch Set: Created 5 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 unified diff | Download patch
OLDNEW
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 #import "chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h" 7 #import "chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h"
8 #import "chrome/browser/ui/cocoa/hung_renderer_controller.h" 8 #import "chrome/browser/ui/cocoa/hung_renderer_controller.h"
9 #import "chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_cocoa.h" 9 #import "chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_cocoa.h"
10 #import "chrome/browser/ui/cocoa/profiles/profile_signin_confirmation_dialog_coc oa.h" 10 #import "chrome/browser/ui/cocoa/profiles/profile_signin_confirmation_dialog_coc oa.h"
11 #import "chrome/browser/ui/cocoa/validation_message_bubble_cocoa.h"
11 #include "content/public/browser/web_contents.h" 12 #include "content/public/browser/web_contents.h"
12 13
13 // static 14 // static
14 void TabDialogs::CreateForWebContents(content::WebContents* contents) { 15 void TabDialogs::CreateForWebContents(content::WebContents* contents) {
15 DCHECK(contents); 16 DCHECK(contents);
16 if (!FromWebContents(contents)) 17 if (!FromWebContents(contents))
17 contents->SetUserData(UserDataKey(), new TabDialogsCocoa(contents)); 18 contents->SetUserData(UserDataKey(), new TabDialogsCocoa(contents));
18 } 19 }
19 20
20 TabDialogsCocoa::TabDialogsCocoa(content::WebContents* contents) 21 TabDialogsCocoa::TabDialogsCocoa(content::WebContents* contents)
(...skipping 26 matching lines...) Expand all
47 browser, web_contents_, profile, username, delegate); 48 browser, web_contents_, profile, username, delegate);
48 } 49 }
49 50
50 void TabDialogsCocoa::ShowManagePasswordsBubble(bool user_action) { 51 void TabDialogsCocoa::ShowManagePasswordsBubble(bool user_action) {
51 ManagePasswordsBubbleCocoa::Show(web_contents_, user_action); 52 ManagePasswordsBubbleCocoa::Show(web_contents_, user_action);
52 } 53 }
53 54
54 void TabDialogsCocoa::HideManagePasswordsBubble() { 55 void TabDialogsCocoa::HideManagePasswordsBubble() {
55 // The bubble is closed when it loses the focus. 56 // The bubble is closed when it loses the focus.
56 } 57 }
58
59 scoped_ptr<ValidationMessageBubble> TabDialogsCocoa::ShowValidationMessage(
60 const gfx::Rect& anchor_in_root_view,
61 const base::string16& main_text,
62 const base::string16& sub_text) {
63 return make_scoped_ptr(new ValidationMessageBubbleCocoa(
64 web_contents_, anchor_in_root_view, main_text, sub_text));
65 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/tab_dialogs_cocoa.h ('k') | chrome/browser/ui/cocoa/validation_message_bubble_cocoa.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698