diff options
| author | yoshiki@chromium.org <yoshiki@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-16 02:13:44 +0000 |
|---|---|---|
| committer | yoshiki@chromium.org <yoshiki@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-16 02:13:44 +0000 |
| commit | b86451cfc9ac8174ac39f24c1e688fb388bdfd44 (patch) | |
| tree | 50e913f4932425cb09bef3a4e00aa932b174ad9e /chrome/browser/ui/gtk | |
| parent | ded09895621502ed6e90fb2037af84b3e884bbf6 (diff) | |
| download | chromium_src-b86451cfc9ac8174ac39f24c1e688fb388bdfd44.zip chromium_src-b86451cfc9ac8174ac39f24c1e688fb388bdfd44.tar.gz chromium_src-b86451cfc9ac8174ac39f24c1e688fb388bdfd44.tar.bz2 | |
Showing Task manager on the foreground window.
If the other Task Manager opens, closes it and opens new Task Manager on the current window.
BUG=chromium-os:8272
TEST=manual on chromium-os
Review URL: http://codereview.chromium.org/7604032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96881 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/gtk')
| -rw-r--r-- | chrome/browser/ui/gtk/browser_window_gtk.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/ui/gtk/browser_window_gtk.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/ui/gtk/browser_window_gtk.cc b/chrome/browser/ui/gtk/browser_window_gtk.cc index e457a4e..608d770 100644 --- a/chrome/browser/ui/gtk/browser_window_gtk.cc +++ b/chrome/browser/ui/gtk/browser_window_gtk.cc @@ -986,9 +986,9 @@ void BrowserWindowGtk::ShowThemeInstallBubble() { ThemeInstallBubbleViewGtk::Show(window_); } -void BrowserWindowGtk::ShowHTMLDialog(HtmlDialogUIDelegate* delegate, - gfx::NativeWindow parent_window) { - browser::ShowHtmlDialog(parent_window, browser_->profile(), delegate); +gfx::NativeWindow BrowserWindowGtk::ShowHTMLDialog( + HtmlDialogUIDelegate* delegate, gfx::NativeWindow parent_window) { + return browser::ShowHtmlDialog(parent_window, browser_->profile(), delegate); } void BrowserWindowGtk::UserChangedTheme() { diff --git a/chrome/browser/ui/gtk/browser_window_gtk.h b/chrome/browser/ui/gtk/browser_window_gtk.h index e511e44..c7fd581 100644 --- a/chrome/browser/ui/gtk/browser_window_gtk.h +++ b/chrome/browser/ui/gtk/browser_window_gtk.h @@ -107,8 +107,8 @@ class BrowserWindowGtk : public BrowserWindow, virtual void ShowCollectedCookiesDialog(TabContents* tab_contents); virtual void ShowThemeInstallBubble(); virtual void ConfirmBrowserCloseWithPendingDownloads(); - virtual void ShowHTMLDialog(HtmlDialogUIDelegate* delegate, - gfx::NativeWindow parent_window); + virtual gfx::NativeWindow ShowHTMLDialog(HtmlDialogUIDelegate* delegate, + gfx::NativeWindow parent_window); virtual void UserChangedTheme(); virtual int GetExtraRenderViewHeight() const; virtual void TabContentsFocused(TabContents* tab_contents); |