roll clang 131935:132017

chrome/browser/ui/gtk/crypto_module_password_dialog.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 "chrome/browser/ui/crypto_module_password_dialog.h"
 
 #include <gtk/gtk.h>
 
 #include "base/basictypes.h"
 #include "base/synchronization/waitable_event.h"
@@ skipping 68 matching lines @@
 
 // TODO(mattm): change into a constrained dialog.
 class CryptoModulePasswordDialog {
  public:
   CryptoModulePasswordDialog(const std::string& slot_name,
                              bool retry,
                              browser::CryptoModulePasswordReason reason,
                              const std::string& server,
                              browser::CryptoModulePasswordCallback* callback);
 
+  virtual ~CryptoModulePasswordDialog() {}

[Evan Martin, 2011/06/07 22:07:20]

Why is this one needed?  It seems like this class has no superclass or virtual
methods...

[Nico, 2011/06/07 22:09:53]

"(For the gtk files, this is necessary because the CHROMEGTK_CALLBACK_ macros
add virtual functions.) "

+
   void Show();
 
  private:
   CHROMEGTK_CALLBACK_1(CryptoModulePasswordDialog, void, OnResponse, int);
   CHROMEGTK_CALLBACK_0(CryptoModulePasswordDialog, void, OnWindowDestroy);
 
   scoped_ptr<browser::CryptoModulePasswordCallback> callback_;
 
   GtkWidget* dialog_;
   GtkWidget* password_entry_;
@@ skipping 122 matching lines @@
 }
 
 crypto::CryptoModuleBlockingPasswordDelegate*
     NewCryptoModuleBlockingDialogDelegate(
         CryptoModulePasswordReason reason,
         const std::string& server) {
   return new CryptoModuleBlockingDialogDelegate(reason, server);
 }
 
 }  // namespace browser