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

Unified Diff: chrome/browser/ui/browser_dialogs.h

Issue 2446573003: chromeos: Make "mobile network" and "set time" dialogs work with mash (Closed)
Patch Set: gn check Created 4 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/ash/web_dialog_util.cc ('k') | chrome/browser/ui/views/chrome_web_dialog_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/browser_dialogs.h
diff --git a/chrome/browser/ui/browser_dialogs.h b/chrome/browser/ui/browser_dialogs.h
index 07c70ee199b46d73f5e1c5f34ee58a07dec4762e..d87d4fd0d5974e876b37a9cdd9941ada83c4d270 100644
--- a/chrome/browser/ui/browser_dialogs.h
+++ b/chrome/browser/ui/browser_dialogs.h
@@ -88,11 +88,23 @@ void HideTaskManager();
gfx::NativeWindow ShowWebDialog(gfx::NativeView parent,
content::BrowserContext* context,
ui::WebDialogDelegate* delegate);
+#endif // !defined(OS_MACOSX)
+
+#if defined(USE_ASH)
+// Creates and shows an HTML dialog with the given delegate and browser context.
+// The dialog is placed in the ash window hierarchy in the given container.
+// See ash/public/cpp/shell_window_ids.h for |container_id| values. The window
+// is destroyed when it is closed. See also chrome::ShowWebDialog().
+void ShowWebDialogInContainer(int container_id,
+ content::BrowserContext* context,
+ ui::WebDialogDelegate* delegate);
+#endif // defined(USE_ASH)
+#if !defined(OS_MACOSX)
// Shows the create web app shortcut dialog box.
void ShowCreateWebAppShortcutsDialog(gfx::NativeWindow parent_window,
content::WebContents* web_contents);
-#endif
+#endif // !defined(OS_MACOSX)
// Shows the create chrome app shortcut dialog box.
// |close_callback| may be null.
« no previous file with comments | « chrome/browser/ui/ash/web_dialog_util.cc ('k') | chrome/browser/ui/views/chrome_web_dialog_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698