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

Unified Diff: chrome/browser/ui/views/frame/browser_view.cc

Issue 7604032: Showing Task manager on the foreground window. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: to be commited Created 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/views/frame/browser_view.h ('k') | chrome/browser/ui/webui/task_manager_dialog.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/frame/browser_view.cc
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index a378bdcce70daa1e1714fd29a9412cd5d2773ab0..363313ff51221aea5f0251bee49653415c6743d1 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -1145,8 +1145,8 @@ void BrowserView::ConfirmBrowserCloseWithPendingDownloads() {
browser::CreateViewsWindow(GetNativeHandle(), view)->Show();
}
-void BrowserView::ShowHTMLDialog(HtmlDialogUIDelegate* delegate,
- gfx::NativeWindow parent_window) {
+gfx::NativeWindow BrowserView::ShowHTMLDialog(HtmlDialogUIDelegate* delegate,
+ gfx::NativeWindow parent_window) {
// Default to using our window as the parent if the argument is not specified.
gfx::NativeWindow parent = parent_window ? parent_window
: GetNativeHandle();
@@ -1154,7 +1154,7 @@ void BrowserView::ShowHTMLDialog(HtmlDialogUIDelegate* delegate,
parent = GetNormalBrowserWindowForBrowser(browser(), NULL);
#endif // defined(OS_CHROMEOS)
- browser::ShowHtmlDialog(parent, browser_.get()->profile(), delegate);
+ return browser::ShowHtmlDialog(parent, browser_.get()->profile(), delegate);
}
void BrowserView::ShowCreateWebAppShortcutsDialog(
« no previous file with comments | « chrome/browser/ui/views/frame/browser_view.h ('k') | chrome/browser/ui/webui/task_manager_dialog.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698