Addressed or cleaned-up a number of TODOs.

chrome/browser/ui/views/stubs_aura.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/logging.h"
 
 #include "chrome/browser/bookmarks/bookmark_editor.h"
 #include "chrome/browser/external_protocol/external_protocol_handler.h"
 #include "chrome/browser/first_run/first_run.h"
 #include "chrome/browser/first_run/first_run_import_observer.h"
@@ skipping 16 matching lines @@
 class CryptoModuleBlockingPasswordDelegate;
 }
 namespace net {
 class SSLCertRequestInfo;
 class X509Certificate;
 }
 namespace views {
 class Widget;
 }
 
-#if !defined(OS_WIN)
-class EditSearchEngineControllerDelegate;
-class TemplateURL;
-#endif
-
 namespace browser {
 
+#if defined(OS_WIN)
 void ShowSSLClientCertificateSelector(

[sky, 2011/11/11 16:50:07]

Can we use the one in
chrome/browser/ui/webui/ssl_client_certificate_selector_webui.cc ?

[Emmanuel Saint-loubert-Bié, 2011/11/11 17:35:42]

Actually this is what we are doing now with this CL (in the Linux case). 
I cannot really test the Windows case at the moment. So I wanted to leave that
unchanged for Windows.

     TabContentsWrapper* parent,
     net::SSLCertRequestInfo* cert_request_info,
     SSLClientAuthHandler* delegate) {
   // TODO(beng):
   NOTIMPLEMENTED();
 }
+#endif
 
 void ShowAboutIPCDialog() {
   // TODO(beng):
   NOTIMPLEMENTED();
 }
 
 #if defined(USE_NSS)
 crypto::CryptoModuleBlockingPasswordDelegate*
     NewCryptoModuleBlockingDialogDelegate(
         CryptoModulePasswordReason reason,
         const std::string& server) {
   // TODO(saintlou):
   NOTIMPLEMENTED();
   return NULL;
 }
 #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,
     CryptoModulePasswordReason reason,
     const std::string& server,
     const CryptoModulePasswordCallback& callback) {
   // TODO(saintlou):
   NOTIMPLEMENTED();
 }
 #endif
@@ skipping 50 matching lines @@
   // TODO(beng);
   NOTIMPLEMENTED();
 }
 
 }  // namespace importer
 
 // static
 void ExternalProtocolHandler::RunExternalProtocolDialog(
     const GURL& url, int render_process_host_id, int routing_id) {
 }