Addressed or cleaned-up a number of TODOs (some obsolete ones were removed too).

BUG=none
TEST=none


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

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

7 files changed, 9 insertions, 29 deletions

diff --git a/chrome/browser/chromeos/frame/panel_browser_view.cc b/chrome/browser/chromeos/frame/panel_browser_view.cc
index 47a7d1b..de39b0e 100644
--- a/chrome/browser/chromeos/frame/panel_browser_view.cc
+++ b/chrome/browser/chromeos/frame/panel_browser_view.cc
@@ -33,9 +33,6 @@ PanelBrowserView::~PanelBrowserView() {}
 // PanelBrowserView functions
 
 void PanelBrowserView::LimitBounds(gfx::Rect* bounds) const {
-#if defined(USE_AURA)
-  // TODO(saintlou): Need PureViews
-#else
   GdkScreen* screen = gtk_widget_get_screen(GetWidget()->GetNativeView());
   int max_width = gdk_screen_get_width(screen) * kPanelMaxWidthFactor;
   int max_height = gdk_screen_get_height(screen) * kPanelMaxHeightFactor;
@@ -54,7 +51,6 @@ void PanelBrowserView::LimitBounds(gfx::Rect* bounds) const {
     bounds->set_height(kPanelMinHeightPixels);
   else if (bounds->height() > max_height)
     bounds->set_height(max_height);
-#endif
 }
 
 
@@ -105,12 +101,8 @@ void PanelBrowserView::UpdateTitleBar() {
 
 void PanelBrowserView::SetCreatorView(PanelBrowserView* creator) {
   DCHECK(creator);
-#if defined(USE_AURA)
-  // TODO(saintlou): Need PureViews
-#else
   GtkWindow* window = creator->GetNativeHandle();
   creator_xid_ = ui::GetX11WindowFromGtkWidget(GTK_WIDGET(window));
-#endif
 }
 
 WindowOpenDisposition PanelBrowserView::GetDispositionForPopupBounds(
diff --git a/chrome/browser/chromeos/system_key_event_listener.cc b/chrome/browser/chromeos/system_key_event_listener.cc
index 23b20f6..6279993 100644
--- a/chrome/browser/chromeos/system_key_event_listener.cc
+++ b/chrome/browser/chromeos/system_key_event_listener.cc
@@ -4,7 +4,6 @@
 
 #include "chrome/browser/chromeos/system_key_event_listener.h"
 
-// TODO(saintlou): should we handle this define in gyp even if only used once?
 #define XK_MISCELLANY 1
 #include <X11/keysymdef.h>
 #include <X11/XF86keysym.h>
diff --git a/chrome/browser/ui/gtk/ssl_client_certificate_selector.cc b/chrome/browser/ui/gtk/ssl_client_certificate_selector.cc
index 3897caa..229fcf9 100644
--- a/chrome/browser/ui/gtk/ssl_client_certificate_selector.cc
+++ b/chrome/browser/ui/gtk/ssl_client_certificate_selector.cc
@@ -349,14 +349,11 @@ void SSLClientCertificateSelector::OnComboBoxChanged(GtkWidget* combo_box) {
 }
 
 void SSLClientCertificateSelector::OnViewClicked(GtkWidget* button) {
-#if !defined(USE_AURA)
-  // TODO(saintlou): need to port to Views.
   net::X509Certificate* cert = GetSelectedCert();
   if (cert) {
     GtkWidget* toplevel = gtk_widget_get_toplevel(root_widget_.get());
     ShowCertificateViewer(GTK_WINDOW(toplevel), cert);
   }
-#endif
 }
 
 void SSLClientCertificateSelector::OnCancelClicked(GtkWidget* button) {
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index ca8f197..4fc3b93 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -1003,8 +1003,12 @@ void BrowserView::ConfirmSetDefaultSearchProvider(TabContents* tab_contents,
 
 void BrowserView::ConfirmAddSearchProvider(const TemplateURL* template_url,
                                            Profile* profile) {
+#if defined(USE_AURA)
+  browser::ConfirmAddSearchProvider(template_url, profile);
+#else
   browser::EditSearchEngine(GetWidget()->GetNativeWindow(), template_url, NULL,
                             profile);
+#endif
 }
 
 void BrowserView::ToggleBookmarkBar() {
diff --git a/chrome/browser/ui/views/stubs_aura.cc b/chrome/browser/ui/views/stubs_aura.cc
index 037617f..c9f690d 100644
--- a/chrome/browser/ui/views/stubs_aura.cc
+++ b/chrome/browser/ui/views/stubs_aura.cc
@@ -34,13 +34,9 @@ namespace views {
 class Widget;
 }
 
-#if !defined(OS_WIN)
-class EditSearchEngineControllerDelegate;
-class TemplateURL;
-#endif
-
 namespace browser {
 
+#if defined(OS_WIN)
 void ShowSSLClientCertificateSelector(
     TabContentsWrapper* parent,
     net::SSLCertRequestInfo* cert_request_info,
@@ -48,6 +44,7 @@ void ShowSSLClientCertificateSelector(
   // TODO(beng):
   NOTIMPLEMENTED();
 }
+#endif
 
 void ShowAboutIPCDialog() {
   // TODO(beng):
@@ -66,15 +63,6 @@ crypto::CryptoModuleBlockingPasswordDelegate*
 #endif
 
 #if !defined(OS_WIN)
-void EditSearchEngine(
-    gfx::NativeWindow,
-    const TemplateURL*,
-    EditSearchEngineControllerDelegate*,
-    Profile*) {
-  // TODO(saintlou):
-  NOTIMPLEMENTED();
-}
-
 void ShowCryptoModulePasswordDialog(
     const std::string& module_name,
     bool retry,
diff --git a/chrome/browser/ui/webui/ssl_client_certificate_selector_webui.cc b/chrome/browser/ui/webui/ssl_client_certificate_selector_webui.cc
index 8b27d57..1c66ee7 100644
--- a/chrome/browser/ui/webui/ssl_client_certificate_selector_webui.cc
+++ b/chrome/browser/ui/webui/ssl_client_certificate_selector_webui.cc
@@ -292,8 +292,9 @@ void ShowSSLClientCertificateSelector(
     net::SSLCertRequestInfo* cert_request_info,
     SSLClientAuthHandler* delegate) {
 #if defined(USE_AURA)
-  // TODO(saintlou): Aura uses always "more WebUI".
-  ShowNativeSSLClientCertificateSelector(wrapper, cert_request_info, delegate);
+  SSLClientCertificateSelectorWebUI::ShowDialog(wrapper,
+                                                cert_request_info,
+                                                delegate);
 #else
   if (ChromeWebUI::IsMoreWebUI())
     SSLClientCertificateSelectorWebUI::ShowDialog(wrapper,
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index 962e856..134ef75 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -503,7 +503,6 @@ void RenderThreadImpl::EnsureWebKitInitialized() {
   WebRuntimeFeatures::enableTouch(true);
   WebKit::WebPopupMenu::setMinimumRowHeight(kPopupListBoxMinimumRowHeight);
 #else
-  // TODO(saintlou): in the future touch should always be enabled
   WebRuntimeFeatures::enableTouch(false);
 #endif