Remove BrowserWindow::ShowHTMLDialog().

I don't see any reason for this method to exist.
It was part of the following call stack:

  TaskManagerDialogImpl::OpenHtmlDialog from
    ui/webui/task_manager_dialog.cc calls

  Browser::BrowserShowHtmlDialog() from ui/browser.cc,
    which calls

  BrowserView::ShowHTMLDialog() from ui/views/frame/browser_view.cc,
    which calls

  browser::ShowHtmlDialog() from ui/views/html_dialog_view.cc,
    which calls

  browser::CreateViewsWindow() from ui/views/window.cc,
    which calls

  chromeos::BubbleWindow::Create()

  (with a hardcoded parameter that I want to change.) :-(

No functional changes intended.

BUG=chromium-os:20998
TEST=built and ran it

Review URL: http://codereview.chromium.org/8083024

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103608 0039d316-1c4b-4281-b951-d872f2087c98

12 files changed, 20 insertions, 71 deletions

diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 2c75f98..a608b8e 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -1145,8 +1145,23 @@ void Browser::CloseTabContents(TabContents* contents) {
 }
 
 gfx::NativeWindow Browser::BrowserShowHtmlDialog(
-    HtmlDialogUIDelegate* delegate, gfx::NativeWindow parent_window) {
-  return window_->ShowHTMLDialog(delegate, parent_window);
+    HtmlDialogUIDelegate* delegate,
+    gfx::NativeWindow parent_window) {
+#if defined(OS_CHROMEOS)
+  // For Chrome OS, first try to parent the dialog over the current browser --
+  // it's likely to be maximized onscreen.  If it isn't tabbed (e.g. it's a
+  // panel), find a browser that is.
+  parent_window = window_->GetNativeHandle();
+  if (!is_type_tabbed()) {
+    Browser* tabbed_browser = BrowserList::FindTabbedBrowser(profile_, true);
+    if (tabbed_browser && tabbed_browser->window())
+      parent_window = tabbed_browser->window()->GetNativeHandle();
+  }
+#endif  // defined(OS_CHROMEOS)
+  if (!parent_window)
+    parent_window = window_->GetNativeHandle();
+
+  return browser::ShowHtmlDialog(parent_window, profile_, delegate);
 }
 
 void Browser::BrowserRenderWidgetShowing() {
diff --git a/chrome/browser/ui/browser_window.h b/chrome/browser/ui/browser_window.h
index 7a2e7f7..227064c 100644
--- a/chrome/browser/ui/browser_window.h
+++ b/chrome/browser/ui/browser_window.h
@@ -247,11 +247,6 @@ class BrowserWindow {
   // has confirmed.
   virtual void ConfirmBrowserCloseWithPendingDownloads() = 0;
 
-  // Shows a dialog box with HTML content. |parent_window| is the window the
-  // dialog should be opened modal to and is a native window handle.
-  virtual gfx::NativeWindow ShowHTMLDialog(HtmlDialogUIDelegate* delegate,
-                                           gfx::NativeWindow parent_window) = 0;
-
   // ThemeService calls this when a user has changed his or her theme,
   // indicating that it's time to redraw everything.
   virtual void UserChangedTheme() = 0;
diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.h b/chrome/browser/ui/cocoa/browser_window_cocoa.h
index 6fcbf53..8b374c1 100644
--- a/chrome/browser/ui/cocoa/browser_window_cocoa.h
+++ b/chrome/browser/ui/cocoa/browser_window_cocoa.h
@@ -85,8 +85,6 @@ class BrowserWindowCocoa : public BrowserWindow,
   virtual void ShowCollectedCookiesDialog(TabContentsWrapper* wrapper);
   virtual void ShowThemeInstallBubble();
   virtual void ConfirmBrowserCloseWithPendingDownloads();
-  virtual gfx::NativeWindow ShowHTMLDialog(HtmlDialogUIDelegate* delegate,
-                                           gfx::NativeWindow parent_window);
   virtual void UserChangedTheme();
   virtual int GetExtraRenderViewHeight() const;
   virtual void TabContentsFocused(TabContents* tab_contents);
diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.mm b/chrome/browser/ui/cocoa/browser_window_cocoa.mm
index af78b51..046e0aa 100644
--- a/chrome/browser/ui/cocoa/browser_window_cocoa.mm
+++ b/chrome/browser/ui/cocoa/browser_window_cocoa.mm
@@ -405,14 +405,6 @@ void BrowserWindowCocoa::ConfirmBrowserCloseWithPendingDownloads() {
                  confirm_close_factory_.GetWeakPtr(), true));
 }
 
-gfx::NativeWindow BrowserWindowCocoa::ShowHTMLDialog(
-    HtmlDialogUIDelegate* delegate,
-    gfx::NativeWindow parent_window) {
-  [HtmlDialogWindowController showHtmlDialog:delegate
-                                     profile:browser_->profile()];
-  return NULL;
-}
-
 void BrowserWindowCocoa::UserChangedTheme() {
   [controller_ userChangedTheme];
 }
diff --git a/chrome/browser/ui/gtk/browser_window_gtk.cc b/chrome/browser/ui/gtk/browser_window_gtk.cc
index 21970a9..2f4d529 100644
--- a/chrome/browser/ui/gtk/browser_window_gtk.cc
+++ b/chrome/browser/ui/gtk/browser_window_gtk.cc
@@ -994,11 +994,6 @@ void BrowserWindowGtk::ShowThemeInstallBubble() {
   ThemeInstallBubbleViewGtk::Show(window_);
 }
 
-gfx::NativeWindow BrowserWindowGtk::ShowHTMLDialog(
-    HtmlDialogUIDelegate* delegate, gfx::NativeWindow parent_window) {
-  return browser::ShowHtmlDialog(parent_window, browser_->profile(), delegate);
-}
-
 void BrowserWindowGtk::UserChangedTheme() {
   SetBackgroundColor();
   InvalidateWindow();
diff --git a/chrome/browser/ui/gtk/browser_window_gtk.h b/chrome/browser/ui/gtk/browser_window_gtk.h
index 58f7d9e..3be9b25 100644
--- a/chrome/browser/ui/gtk/browser_window_gtk.h
+++ b/chrome/browser/ui/gtk/browser_window_gtk.h
@@ -122,8 +122,6 @@ class BrowserWindowGtk : public BrowserWindow,
   virtual void ShowCollectedCookiesDialog(TabContentsWrapper* tab_contents);
   virtual void ShowThemeInstallBubble();
   virtual void ConfirmBrowserCloseWithPendingDownloads();
-  virtual gfx::NativeWindow ShowHTMLDialog(HtmlDialogUIDelegate* delegate,
-                                           gfx::NativeWindow parent_window);
   virtual void UserChangedTheme();
   virtual int GetExtraRenderViewHeight() const;
   virtual void TabContentsFocused(TabContents* tab_contents);
diff --git a/chrome/browser/ui/panels/panel.cc b/chrome/browser/ui/panels/panel.cc
index 3a35920..2aa998b 100644
--- a/chrome/browser/ui/panels/panel.cc
+++ b/chrome/browser/ui/panels/panel.cc
@@ -400,12 +400,6 @@ void Panel::ConfirmBrowserCloseWithPendingDownloads() {
   NOTIMPLEMENTED();
 }
 
-gfx::NativeWindow Panel::ShowHTMLDialog(HtmlDialogUIDelegate* delegate,
-                                        gfx::NativeWindow parent_window) {
-  NOTIMPLEMENTED();
-  return NULL;
-}
-
 void Panel::UserChangedTheme() {
   native_panel_->NotifyPanelOnUserChangedTheme();
 }
diff --git a/chrome/browser/ui/panels/panel.h b/chrome/browser/ui/panels/panel.h
index 0c672d9..bc916e1 100644
--- a/chrome/browser/ui/panels/panel.h
+++ b/chrome/browser/ui/panels/panel.h
@@ -122,9 +122,6 @@ class Panel : public BrowserWindow, public NotificationObserver {
   virtual void ShowCollectedCookiesDialog(TabContentsWrapper* wrapper) OVERRIDE;
   virtual void ShowThemeInstallBubble() OVERRIDE;
   virtual void ConfirmBrowserCloseWithPendingDownloads() OVERRIDE;
-  virtual gfx::NativeWindow ShowHTMLDialog(
-      HtmlDialogUIDelegate* delegate,
-      gfx::NativeWindow parent_window) OVERRIDE;
   virtual void UserChangedTheme() OVERRIDE;
   virtual int GetExtraRenderViewHeight() const OVERRIDE;
   virtual void TabContentsFocused(TabContents* tab_contents) OVERRIDE;
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index db0718f..e821328 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -158,25 +158,6 @@ static const int kNewtabBarRoundness = 5;
 // Returned from BrowserView::GetClassName.
 const char BrowserView::kViewClassName[] = "browser/ui/views/BrowserView";
 
-#if defined(OS_CHROMEOS)
-// Get a normal browser window of given |profile| to use as dialog parent
-// if given |browser| is not one. Otherwise, returns browser window of
-// |browser|. If |profile| is NULL, |browser|'s profile is used to find the
-// normal browser.
-static gfx::NativeWindow GetNormalBrowserWindowForBrowser(Browser* browser,
-                                                          Profile* profile) {
-  if (!browser->is_type_tabbed()) {
-    Browser* normal_browser = BrowserList::FindTabbedBrowser(
-        profile ? profile : browser->profile(),
-        true);
-    if (normal_browser && normal_browser->window())
-      return normal_browser->window()->GetNativeHandle();
-  }
-
-  return browser->window()->GetNativeHandle();
-}
-#endif  // defined(OS_CHROMEOS)
-
 ///////////////////////////////////////////////////////////////////////////////
 // BookmarkExtensionBackground, private:
 // This object serves as the views::Background object which is used to layout
@@ -1115,18 +1096,6 @@ void BrowserView::ConfirmBrowserCloseWithPendingDownloads() {
   browser::CreateViewsWindow(GetNativeHandle(), view)->Show();
 }
 
-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();
-#if defined(OS_CHROMEOS)
-  parent = GetNormalBrowserWindowForBrowser(browser(), NULL);
-#endif  // defined(OS_CHROMEOS)
-
-  return browser::ShowHtmlDialog(parent, browser_.get()->profile(), delegate);
-}
-
 void BrowserView::ShowCreateWebAppShortcutsDialog(
     TabContentsWrapper* tab_contents) {
   browser::ShowCreateWebAppShortcutsDialog(GetNativeHandle(), tab_contents);
diff --git a/chrome/browser/ui/views/frame/browser_view.h b/chrome/browser/ui/views/frame/browser_view.h
index 26891a0..4a17613 100644
--- a/chrome/browser/ui/views/frame/browser_view.h
+++ b/chrome/browser/ui/views/frame/browser_view.h
@@ -297,9 +297,6 @@ class BrowserView : public BrowserBubbleHost,
   virtual void ShowCollectedCookiesDialog(TabContentsWrapper* wrapper) OVERRIDE;
   virtual void ShowThemeInstallBubble() OVERRIDE;
   virtual void ConfirmBrowserCloseWithPendingDownloads() OVERRIDE;
-  virtual gfx::NativeWindow ShowHTMLDialog(
-      HtmlDialogUIDelegate* delegate,
-      gfx::NativeWindow parent_window) OVERRIDE;
   virtual void UserChangedTheme() OVERRIDE;
   virtual int GetExtraRenderViewHeight() const OVERRIDE;
   virtual void TabContentsFocused(TabContents* source) OVERRIDE;
diff --git a/chrome/browser/ui/views/html_dialog_view.cc b/chrome/browser/ui/views/html_dialog_view.cc
index 876810c..418c7fd 100644
--- a/chrome/browser/ui/views/html_dialog_view.cc
+++ b/chrome/browser/ui/views/html_dialog_view.cc
@@ -28,10 +28,10 @@ class RenderWidgetHost;
 namespace browser {
 
 // Declared in browser_dialogs.h so that others don't need to depend on our .h.
-gfx::NativeWindow ShowHtmlDialog(gfx::NativeWindow parent, Profile* profile,
+gfx::NativeWindow ShowHtmlDialog(gfx::NativeWindow parent,
+                                 Profile* profile,
                                  HtmlDialogUIDelegate* delegate) {
-  HtmlDialogView* html_view =
-      new HtmlDialogView(profile, delegate);
+  HtmlDialogView* html_view = new HtmlDialogView(profile, delegate);
   browser::CreateViewsWindow(parent, html_view);
   html_view->InitDialog();
   html_view->GetWidget()->Show();
diff --git a/chrome/browser/ui/webui/task_manager_dialog.cc b/chrome/browser/ui/webui/task_manager_dialog.cc
index 5bf6ad0..b6ca3d4 100644
--- a/chrome/browser/ui/webui/task_manager_dialog.cc
+++ b/chrome/browser/ui/webui/task_manager_dialog.cc
@@ -146,4 +146,3 @@ void TaskManagerDialog::ShowBackgroundPages() {
       BrowserThread::UI, FROM_HERE,
       NewRunnableFunction(&TaskManagerDialogImpl::Show, true));
 }
-