Enable some WebUI dialogs by default on ChromeOS

Enable the WebUI certificate viewier, hung renderer dialog and edit search
engine dialog on ChromeOS.

BUG=98027
TEST=


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

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

3 files changed, 30 insertions, 27 deletions

diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 9a8948c..f83cafd 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -4167,15 +4167,19 @@ void Browser::ConfirmSetDefaultSearchProvider(TabContents* tab_contents,
 
 void Browser::ConfirmAddSearchProvider(const TemplateURL* template_url,
                                        Profile* profile) {
-  // If we are using web UI dialogs, then redirect this dialog to the web UI
-  // version.  Otherwise, call the existing framework, which is called by way of
-  // window()->ConfirmAddSearchProvider.
-  if (ChromeWebUI::IsMoreWebUI()) {
-    // Call a clean API to confirm adding a search provider.
+#if defined(OS_CHROMEOS) || defined(USE_AURA)
+  // Use a WebUI implementation of the dialog.
+  browser::ConfirmAddSearchProvider(template_url, profile);
+#else
+  // TODO(rbyers): Remove the IsMoreWebUI check and (ideally) all #ifdefs once
+  // we can select exactly one version of this dialog to use for each platform
+  // at build time.
+  if (ChromeWebUI::IsMoreWebUI())
     browser::ConfirmAddSearchProvider(template_url, profile);
-  } else {
+  else
+    // Platform-specific implementation of the dialog.
     window()->ConfirmAddSearchProvider(template_url, profile);
-  }
+#endif
 }
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/chrome/browser/ui/webui/certificate_viewer.cc b/chrome/browser/ui/webui/certificate_viewer.cc
index ccaca7c..8e012ff 100644
--- a/chrome/browser/ui/webui/certificate_viewer.cc
+++ b/chrome/browser/ui/webui/certificate_viewer.cc
@@ -28,18 +28,21 @@ const int kDefaultHeight = 600;
 
 }  // namespace
 
-// Shows a certificate using the native or WebUI certificate viewer.
+// Shows a certificate using the native or WebUI certificate viewer on
+// platforms where we supply our own (Mac and Windows have one built into the
+// OS we use instead).
 void ShowCertificateViewer(gfx::NativeWindow parent,
                            net::X509Certificate* cert) {
-#if defined(USE_AURA)
-  // TODO(saintlou): Aura uses always "more WebUI".
+#if defined(USE_AURA) || defined(OS_CHROMEOS)
   CertificateViewerDialog::ShowDialog(parent, cert);
 #else
-  if (ChromeWebUI::IsMoreWebUI()) {
+  // TODO(rbyers): Decide whether to replace the GTK certificate viewier on
+  // Linux with the WebUI version, and (either way) remove this IsMoreWebUI
+  // check.
+  if (ChromeWebUI::IsMoreWebUI())
     CertificateViewerDialog::ShowDialog(parent, cert);
-  } else {
+  else
     ShowNativeCertificateViewer(parent, cert);
-  }
 #endif
 }
 
diff --git a/chrome/browser/ui/webui/hung_renderer_dialog.cc b/chrome/browser/ui/webui/hung_renderer_dialog.cc
index 0fee14a..de02334 100644
--- a/chrome/browser/ui/webui/hung_renderer_dialog.cc
+++ b/chrome/browser/ui/webui/hung_renderer_dialog.cc
@@ -34,30 +34,26 @@ const int kHungRendererDialogHeight = 200;
 namespace browser {
 
 void ShowHungRendererDialog(TabContents* contents) {
-#if defined(USE_AURA)
-  // TODO(saintlou): Aura uses always "more WebUI".
+#if defined(OS_CHROMEOS) || defined(USE_AURA)
   HungRendererDialog::ShowHungRendererDialog(contents);
 #else
-  if (ChromeWebUI::IsMoreWebUI()) {
+  // TODO(rbyers): Remove IsMoreWebUI check once we decide for sure which
+  // platforms will use the WebUI version of this dialog.
+  if (ChromeWebUI::IsMoreWebUI())
     HungRendererDialog::ShowHungRendererDialog(contents);
-    return;
-  }
-
-  ShowNativeHungRendererDialog(contents);
+  else
+    ShowNativeHungRendererDialog(contents);
 #endif
 }
 
 void HideHungRendererDialog(TabContents* contents) {
-#if defined(USE_AURA)
-  // TODO(saintlou): Aura uses always "more WebUI".
+#if defined(OS_CHROMEOS) || defined(USE_AURA)
   HungRendererDialog::HideHungRendererDialog(contents);
 #else
-  if (ChromeWebUI::IsMoreWebUI()) {
+  if (ChromeWebUI::IsMoreWebUI())
     HungRendererDialog::HideHungRendererDialog(contents);
-    return;
-  }
-
-  HideNativeHungRendererDialog(contents);
+  else
+    HideNativeHungRendererDialog(contents);
 #endif
 }