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

Unified Diff: chrome/browser/ui/views/chrome_web_dialog_view.cc

Issue 2871073002: cros: Bind hangup red button on remote controller to close web dialog (Closed)
Patch Set: nits Created 3 years, 7 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/browser_dialogs.h ('k') | ui/views/controls/webview/web_dialog_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/chrome_web_dialog_view.cc
diff --git a/chrome/browser/ui/views/chrome_web_dialog_view.cc b/chrome/browser/ui/views/chrome_web_dialog_view.cc
index be32d21ea6f309029df5348756a5d693ed59bb6d..041dc9da51bc11058fe817b342a0ab6df4783a40 100644
--- a/chrome/browser/ui/views/chrome_web_dialog_view.cc
+++ b/chrome/browser/ui/views/chrome_web_dialog_view.cc
@@ -50,9 +50,9 @@ gfx::NativeWindow ShowWebDialog(gfx::NativeView parent,
}
#if defined(USE_ASH)
-void ShowWebDialogInContainer(int container_id,
- content::BrowserContext* context,
- ui::WebDialogDelegate* delegate) {
+gfx::NativeWindow ShowWebDialogInContainer(int container_id,
+ content::BrowserContext* context,
+ ui::WebDialogDelegate* delegate) {
DCHECK(container_id != ash::kShellWindowId_Invalid);
views::WebDialogView* view =
new views::WebDialogView(context, delegate, new ChromeWebContentsHandler);
@@ -66,7 +66,7 @@ void ShowWebDialogInContainer(int container_id,
params.parent = ash::Shell::GetContainer(ash::Shell::GetPrimaryRootWindow(),
container_id);
}
- ShowWebDialogWidget(params, view);
+ return ShowWebDialogWidget(params, view);
}
#endif // defined(USE_ASH)
« no previous file with comments | « chrome/browser/ui/browser_dialogs.h ('k') | ui/views/controls/webview/web_dialog_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698