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

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

Issue 2004043003: Expose the MacViewsWebUIDialogs feature flag to chrome://flags (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@20160520-Enums-MakeThemInt-HeaderChanges-ROLLUP
Patch Set: remove unused #includes Created 4 years, 6 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
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/ui/browser_dialogs_mac.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "build/build_config.h" 9 #include "build/build_config.h"
10 #include "chrome/browser/ui/bookmarks/bookmark_editor.h" 10 #include "chrome/browser/ui/bookmarks/bookmark_editor.h"
11 #include "components/security_state/security_state_model.h" 11 #include "components/security_state/security_state_model.h"
12 #include "third_party/skia/include/core/SkColor.h" 12 #include "third_party/skia/include/core/SkColor.h"
13 #include "ui/gfx/native_widget_types.h" 13 #include "ui/gfx/native_widget_types.h"
14 14
15 class Browser; 15 class Browser;
16 class ContentSettingBubbleModel; 16 class ContentSettingBubbleModel;
17 class GURL; 17 class GURL;
18 class LoginHandler; 18 class LoginHandler;
19 class Profile; 19 class Profile;
20 20
21 namespace base {
22 struct Feature;
23 }
24
21 namespace bookmarks { 25 namespace bookmarks {
22 class BookmarkBubbleObserver; 26 class BookmarkBubbleObserver;
23 } 27 }
24 28
25 namespace content { 29 namespace content {
26 class BrowserContext; 30 class BrowserContext;
27 class ColorChooser; 31 class ColorChooser;
28 class WebContents; 32 class WebContents;
29 } 33 }
30 34
(...skipping 10 matching lines...) Expand all
41 class URLRequest; 45 class URLRequest;
42 } 46 }
43 47
44 namespace ui { 48 namespace ui {
45 class TableModel; 49 class TableModel;
46 class WebDialogDelegate; 50 class WebDialogDelegate;
47 } 51 }
48 52
49 namespace chrome { 53 namespace chrome {
50 54
55 #if defined(OS_MACOSX)
56 // Makes ToolkitViewsDialogsEnabled() available to chrome://flags.
57 extern const base::Feature kMacViewsNativeDialogs;
58
59 // Makes ToolkitViewsWebUIDialogsEnabled() available to chrome://flags.
60 extern const base::Feature kMacViewsWebUIDialogs;
61 #endif // OS_MACOSX
62
51 // Shows or hides the Task Manager. |browser| can be NULL when called from Ash. 63 // Shows or hides the Task Manager. |browser| can be NULL when called from Ash.
52 // Returns a pointer to the underlying TableModel, which can be ignored, or used 64 // Returns a pointer to the underlying TableModel, which can be ignored, or used
53 // for testing. 65 // for testing.
54 ui::TableModel* ShowTaskManager(Browser* browser); 66 ui::TableModel* ShowTaskManager(Browser* browser);
55 void HideTaskManager(); 67 void HideTaskManager();
56 68
57 #if !defined(OS_MACOSX) 69 #if !defined(OS_MACOSX)
58 // Creates and shows an HTML dialog with the given delegate and context. 70 // Creates and shows an HTML dialog with the given delegate and context.
59 // The window is automatically destroyed when it is closed. 71 // The window is automatically destroyed when it is closed.
60 // Returns the created window. 72 // Returns the created window.
(...skipping 17 matching lines...) Expand all
78 const extensions::Extension* app, 90 const extensions::Extension* app,
79 const base::Callback<void(bool /* created */)>& close_callback); 91 const base::Callback<void(bool /* created */)>& close_callback);
80 92
81 // Shows a color chooser that reports to the given WebContents. 93 // Shows a color chooser that reports to the given WebContents.
82 content::ColorChooser* ShowColorChooser(content::WebContents* web_contents, 94 content::ColorChooser* ShowColorChooser(content::WebContents* web_contents,
83 SkColor initial_color); 95 SkColor initial_color);
84 96
85 #if defined(OS_MACOSX) 97 #if defined(OS_MACOSX)
86 98
87 // For Mac, returns true if Chrome should show an equivalent toolkit-views based 99 // For Mac, returns true if Chrome should show an equivalent toolkit-views based
88 // dialog using one of the functions below, rather than showing a Cocoa dialog. 100 // dialog instead of a native-looking Cocoa dialog.
89 bool ToolkitViewsDialogsEnabled(); 101 bool ToolkitViewsDialogsEnabled();
90 102
91 // For Mac, returns true if Chrome should show an equivalent toolkit-views based 103 // For Mac, returns true if Chrome should show an equivalent toolkit-views based
92 // dialog instead of a WebUI-styled Cocoa dialog. ToolkitViewsDialogsEnabled() 104 // dialog instead of a WebUI-styled Cocoa dialog.
93 // implies ToolkitViewsWebUIDialogsEnabled().
94 bool ToolkitViewsWebUIDialogsEnabled(); 105 bool ToolkitViewsWebUIDialogsEnabled();
95 106
96 // Shows a Views website settings bubble at the given anchor point. 107 // Shows a Views website settings bubble at the given anchor point.
97 void ShowWebsiteSettingsBubbleViewsAtPoint( 108 void ShowWebsiteSettingsBubbleViewsAtPoint(
98 const gfx::Point& anchor_point, 109 const gfx::Point& anchor_point,
99 Profile* profile, 110 Profile* profile,
100 content::WebContents* web_contents, 111 content::WebContents* web_contents,
101 const GURL& url, 112 const GURL& url,
102 const security_state::SecurityStateModel::SecurityInfo& security_info); 113 const security_state::SecurityStateModel::SecurityInfo& security_info);
103 114
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 DISALLOW_IMPLICIT_CONSTRUCTORS(ContentSettingBubbleViewsBridge); 159 DISALLOW_IMPLICIT_CONSTRUCTORS(ContentSettingBubbleViewsBridge);
149 }; 160 };
150 161
151 #endif // OS_MACOSX 162 #endif // OS_MACOSX
152 163
153 #endif // TOOLKIT_VIEWS 164 #endif // TOOLKIT_VIEWS
154 165
155 } // namespace chrome 166 } // namespace chrome
156 167
157 #endif // CHROME_BROWSER_UI_BROWSER_DIALOGS_H_ 168 #endif // CHROME_BROWSER_UI_BROWSER_DIALOGS_H_
OLDNEW
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/ui/browser_dialogs_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698