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

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

Issue 1274083002: Add flag to show toolkit-views dialogs on Mac, start with HTTP-Auth. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Meatier comments 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 Profile; 14 class Profile;
14 class SkBitmap; 15 class SkBitmap;
15 16
16 namespace content { 17 namespace content {
17 class BrowserContext; 18 class BrowserContext;
18 class ColorChooser; 19 class ColorChooser;
19 class WebContents; 20 class WebContents;
20 } 21 }
21 22
22 namespace extensions { 23 namespace extensions {
23 class Extension; 24 class Extension;
24 } 25 }
25 26
27 namespace net {
28 class AuthChallengeInfo;
29 class URLRequest;
30 }
31
26 namespace ui { 32 namespace ui {
27 class WebDialogDelegate; 33 class WebDialogDelegate;
28 } 34 }
29 35
30 namespace chrome { 36 namespace chrome {
31 37
32 // Creates and shows an HTML dialog with the given delegate and context. 38 // Creates and shows an HTML dialog with the given delegate and context.
33 // The window is automatically destroyed when it is closed. 39 // The window is automatically destroyed when it is closed.
34 // Returns the created window. 40 // Returns the created window.
35 // 41 //
(...skipping 26 matching lines...) Expand all
62 void ShowCreateChromeAppShortcutsDialog( 68 void ShowCreateChromeAppShortcutsDialog(
63 gfx::NativeWindow parent_window, 69 gfx::NativeWindow parent_window,
64 Profile* profile, 70 Profile* profile,
65 const extensions::Extension* app, 71 const extensions::Extension* app,
66 const base::Callback<void(bool /* created */)>& close_callback); 72 const base::Callback<void(bool /* created */)>& close_callback);
67 73
68 // Shows a color chooser that reports to the given WebContents. 74 // Shows a color chooser that reports to the given WebContents.
69 content::ColorChooser* ShowColorChooser(content::WebContents* web_contents, 75 content::ColorChooser* ShowColorChooser(content::WebContents* web_contents,
70 SkColor initial_color); 76 SkColor initial_color);
71 77
78 #if defined(OS_MACOSX)
79
80 // 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.
82 bool ToolkitViewsDialogsEnabled();
83
84 #endif
85
86 // Creates a toolkit-views based LoginHandler (e.g. HTTP-Auth dialog).
msw 2015/08/07 02:23:33 Hmm, should this be in a TOOLKIT_VIEWS ifdef? Mayb
tapted 2015/08/07 03:40:17 Done. (It's in non_ios_sources, but there at least
87 LoginHandler* CreateLoginHandlerViews(net::AuthChallengeInfo* auth_info,
88 net::URLRequest* request);
89
72 } // namespace chrome 90 } // namespace chrome
73 91
74 #endif // CHROME_BROWSER_UI_BROWSER_DIALOGS_H_ 92 #endif // CHROME_BROWSER_UI_BROWSER_DIALOGS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698