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

Side by Side Diff: chrome/browser/ui/browser_dialogs.h

Issue 1280673003: [Mac] Enable MacViews site settings bubble behind --enable-mac-views-dialogs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@enabledialogs
Patch Set: Created 5 years, 4 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef CHROME_BROWSER_UI_BROWSER_DIALOGS_H_ 5 #ifndef CHROME_BROWSER_UI_BROWSER_DIALOGS_H_
6 #define CHROME_BROWSER_UI_BROWSER_DIALOGS_H_ 6 #define CHROME_BROWSER_UI_BROWSER_DIALOGS_H_
7 7
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "third_party/skia/include/core/SkColor.h" 9 #include "third_party/skia/include/core/SkColor.h"
10 #include "ui/gfx/native_widget_types.h" 10 #include "ui/gfx/native_widget_types.h"
11 11
12 class Browser; 12 class Browser;
13 class LoginHandler; 13 class LoginHandler;
14 class Profile; 14 class Profile;
15 class SkBitmap; 15 class SkBitmap;
16 class GURL;
tapted 2015/08/10 05:44:23 nit: sort
jackhou1 2015/08/10 09:11:09 Done.
16 17
17 namespace content { 18 namespace content {
18 class BrowserContext; 19 class BrowserContext;
19 class ColorChooser; 20 class ColorChooser;
21 struct SSLStatus;
20 class WebContents; 22 class WebContents;
21 } 23 }
22 24
23 namespace extensions { 25 namespace extensions {
24 class Extension; 26 class Extension;
25 } 27 }
26 28
29 namespace gfx {
30 class Point;
31 }
32
27 namespace net { 33 namespace net {
28 class AuthChallengeInfo; 34 class AuthChallengeInfo;
29 class URLRequest; 35 class URLRequest;
30 } 36 }
31 37
32 namespace ui { 38 namespace ui {
33 class WebDialogDelegate; 39 class WebDialogDelegate;
34 } 40 }
35 41
42 namespace views {
43 class View;
tapted 2015/08/10 05:44:23 this feels out of place here.... Maybe there's a n
jackhou1 2015/08/10 09:11:09 Done.
44 }
45
36 namespace chrome { 46 namespace chrome {
37 47
38 // Creates and shows an HTML dialog with the given delegate and context. 48 // Creates and shows an HTML dialog with the given delegate and context.
39 // The window is automatically destroyed when it is closed. 49 // The window is automatically destroyed when it is closed.
40 // Returns the created window. 50 // Returns the created window.
41 // 51 //
42 // Make sure to use the returned window only when you know it is safe 52 // Make sure to use the returned window only when you know it is safe
43 // to do so, i.e. before OnDialogClosed() is called on the delegate. 53 // to do so, i.e. before OnDialogClosed() is called on the delegate.
44 gfx::NativeWindow ShowWebDialog(gfx::NativeView parent, 54 gfx::NativeWindow ShowWebDialog(gfx::NativeView parent,
45 content::BrowserContext* context, 55 content::BrowserContext* context,
(...skipping 28 matching lines...) Expand all
74 // Shows a color chooser that reports to the given WebContents. 84 // Shows a color chooser that reports to the given WebContents.
75 content::ColorChooser* ShowColorChooser(content::WebContents* web_contents, 85 content::ColorChooser* ShowColorChooser(content::WebContents* web_contents,
76 SkColor initial_color); 86 SkColor initial_color);
77 87
78 #if defined(OS_MACOSX) 88 #if defined(OS_MACOSX)
79 89
80 // For Mac, returns true if Chrome should show an equivalent toolkit-views based 90 // For Mac, returns true if Chrome should show an equivalent toolkit-views based
81 // dialog using one of the functions below, rather than showing a Cocoa dialog. 91 // dialog using one of the functions below, rather than showing a Cocoa dialog.
82 bool ToolkitViewsDialogsEnabled(); 92 bool ToolkitViewsDialogsEnabled();
83 93
94 // Shows a Views website settings bubble at the given anchor point.
95 void ShowWebsiteSettingsBubbleViewsAtPoint(const gfx::Point& anchor_point,
96 Profile* profile,
97 content::WebContents* web_contents,
98 const GURL& url,
99 const content::SSLStatus& ssl,
100 Browser* browser);
101
84 #endif // OS_MACOSX 102 #endif // OS_MACOSX
85 103
86 #if defined(TOOLKIT_VIEWS) 104 #if defined(TOOLKIT_VIEWS)
87 105
88 // Creates a toolkit-views based LoginHandler (e.g. HTTP-Auth dialog). 106 // Creates a toolkit-views based LoginHandler (e.g. HTTP-Auth dialog).
89 LoginHandler* CreateLoginHandlerViews(net::AuthChallengeInfo* auth_info, 107 LoginHandler* CreateLoginHandlerViews(net::AuthChallengeInfo* auth_info,
90 net::URLRequest* request); 108 net::URLRequest* request);
91 109
110 // Shows a website settings bubble or internal page bubble.
111 void ShowWebsiteSettingsBubbleViews(views::View* anchor_view,
112 Profile* profile,
113 content::WebContents* web_contents,
114 const GURL& url,
115 const content::SSLStatus& ssl,
116 Browser* browser);
117
92 #endif // TOOLKIT_VIEWS 118 #endif // TOOLKIT_VIEWS
93 119
94 } // namespace chrome 120 } // namespace chrome
95 121
96 #endif // CHROME_BROWSER_UI_BROWSER_DIALOGS_H_ 122 #endif // CHROME_BROWSER_UI_BROWSER_DIALOGS_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/browser_dialogs_mac.cc » ('j') | chrome/browser/ui/browser_dialogs_mac.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698