RefCounted types should not have public destructors, chrome/browser/ui

chrome/browser/ui/cocoa/select_file_dialog_mac.mm

 // Copyright (c) 2012 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/select_file_dialog.h"
 
 #import <Cocoa/Cocoa.h>
 #include <CoreServices/CoreServices.h>
 
 #include <map>
@@ skipping 36 matching lines @@
 // NSSavePanel delegate method
 - (BOOL)panel:(id)sender shouldShowFilename:(NSString *)filename;
 
 @end
 
 // Implementation of SelectFileDialog that shows Cocoa dialogs for choosing a
 // file or folder.
 class SelectFileDialogImpl : public SelectFileDialog {
  public:
   explicit SelectFileDialogImpl(Listener* listener);
-  virtual ~SelectFileDialogImpl();
 
   // BaseShellDialog implementation.
   virtual bool IsRunning(gfx::NativeWindow parent_window) const;
   virtual void ListenerDestroyed();
 
   // Callback from ObjC bridge.
   void FileWasSelected(NSSavePanel* dialog,
                        NSWindow* parent_window,
                        bool was_cancelled,
                        bool is_multi,
@@ skipping 10 matching lines @@
  protected:
   // SelectFileDialog implementation.
   // |params| is user data we pass back via the Listener interface.
   virtual void SelectFileImpl(Type type,
                               const string16& title,
                               const FilePath& default_path,
                               const FileTypeInfo* file_types,
                               int file_type_index,
                               const FilePath::StringType& default_extension,
                               gfx::NativeWindow owning_window,
-                              void* params);
+                              void* params) OVERRIDE;
 
  private:
+  virtual ~SelectFileDialogImpl();
+
   // Gets the accessory view for the save dialog.
   NSView* GetAccessoryView(const FileTypeInfo* file_types,
                            int file_type_index);
 
   virtual bool HasMultipleFileTypeChoicesImpl();
 
   // The bridge for results from Cocoa to return to us.
   scoped_nsobject<SelectFileDialogBridge> bridge_;
 
   // A map from file dialogs to the |params| user data associated with them.
@@ skipping 14 matching lines @@
 SelectFileDialog* SelectFileDialog::Create(Listener* listener) {
   return new SelectFileDialogImpl(listener);
 }
 
 SelectFileDialogImpl::SelectFileDialogImpl(Listener* listener)
     : SelectFileDialog(listener),
       bridge_([[SelectFileDialogBridge alloc]
                initWithSelectFileDialogImpl:this]) {
 }
 
-SelectFileDialogImpl::~SelectFileDialogImpl() {
-  // Walk through the open dialogs and close them all.  Use a temporary vector
-  // to hold the pointers, since we can't delete from the map as we're iterating
-  // through it.
-  std::vector<NSSavePanel*> panels;
-  for (std::map<NSSavePanel*, void*>::iterator it = params_map_.begin();
-       it != params_map_.end(); ++it) {
-    panels.push_back(it->first);
-  }
-
-  for (std::vector<NSSavePanel*>::iterator it = panels.begin();
-       it != panels.end(); ++it) {
-    [*it cancel:*it];
-  }
-}
-
 bool SelectFileDialogImpl::IsRunning(gfx::NativeWindow parent_window) const {
   return parents_.find(parent_window) != parents_.end();
 }
 
 void SelectFileDialogImpl::ListenerDestroyed() {
   listener_ = NULL;
 }
 
+void SelectFileDialogImpl::FileWasSelected(NSSavePanel* dialog,
+                                           NSWindow* parent_window,
+                                           bool was_cancelled,
+                                           bool is_multi,
+                                           const std::vector<FilePath>& files,
+                                           int index) {
+  void* params = params_map_[dialog];
+  params_map_.erase(dialog);
+  parents_.erase(parent_window);
+  type_map_.erase(dialog);
+
+  [dialog setDelegate:nil];
+
+  if (!listener_)
+    return;
+
+  if (was_cancelled) {
+    listener_->FileSelectionCanceled(params);
+  } else {
+    if (is_multi) {
+      listener_->MultiFilesSelected(files, params);
+    } else {
+      listener_->FileSelected(files[0], index, params);
+    }
+  }
+}
+
+bool SelectFileDialogImpl::ShouldEnableFilename(NSSavePanel* dialog,
+                                                NSString* filename) {
+  // If this is a single open file dialog, disable selecting packages.
+  if (type_map_[dialog] != SELECT_OPEN_FILE)
+    return true;
+
+  return ![[NSWorkspace sharedWorkspace] isFilePackageAtPath:filename];
+}
+
 void SelectFileDialogImpl::SelectFileImpl(
     Type type,
     const string16& title,
     const FilePath& default_path,
     const FileTypeInfo* file_types,
     int file_type_index,
     const FilePath::StringType& default_extension,
     gfx::NativeWindow owning_window,
     void* params) {
   DCHECK(type == SELECT_FOLDER ||
@@ skipping 104 matching lines @@
     [open_dialog beginSheetForDirectory:default_dir
                                    file:default_filename
                                   types:allowed_file_types
                          modalForWindow:owning_window
                           modalDelegate:bridge_.get()
                         didEndSelector:@selector(endedPanel:withReturn:context:)
                             contextInfo:context];
   }
 }
 
-void SelectFileDialogImpl::FileWasSelected(NSSavePanel* dialog,
-                                           NSWindow* parent_window,
-                                           bool was_cancelled,
-                                           bool is_multi,
-                                           const std::vector<FilePath>& files,
-                                           int index) {
-  void* params = params_map_[dialog];
-  params_map_.erase(dialog);
-  parents_.erase(parent_window);
-  type_map_.erase(dialog);
+SelectFileDialogImpl::~SelectFileDialogImpl() {
+  // Walk through the open dialogs and close them all.  Use a temporary vector
+  // to hold the pointers, since we can't delete from the map as we're iterating
+  // through it.
+  std::vector<NSSavePanel*> panels;
+  for (std::map<NSSavePanel*, void*>::iterator it = params_map_.begin();
+       it != params_map_.end(); ++it) {
+    panels.push_back(it->first);
+  }
 
-  [dialog setDelegate:nil];
-
-  if (!listener_)
-    return;
-
-  if (was_cancelled) {
-    listener_->FileSelectionCanceled(params);
-  } else {
-    if (is_multi) {
-      listener_->MultiFilesSelected(files, params);
-    } else {
-      listener_->FileSelected(files[0], index, params);
-    }
+  for (std::vector<NSSavePanel*>::iterator it = panels.begin();
+       it != panels.end(); ++it) {
+    [*it cancel:*it];
   }
 }
 
 NSView* SelectFileDialogImpl::GetAccessoryView(const FileTypeInfo* file_types,
                                                int file_type_index) {
   DCHECK(file_types);
   NSView* accessory_view = ui::GetViewFromNib(@"SaveAccessoryView");
   if (!accessory_view)
     return nil;
 
@@ skipping 21 matching lines @@
       type_description =
           [NSString stringWithString:(NSString*)description.get()];
     }
     [popup addItemWithTitle:type_description];
   }
 
   [popup selectItemAtIndex:file_type_index-1];  // 1-based
   return accessory_view;
 }
 
-bool SelectFileDialogImpl::ShouldEnableFilename(NSSavePanel* dialog,
-                                                NSString* filename) {
-  // If this is a single open file dialog, disable selecting packages.
-  if (type_map_[dialog] != SELECT_OPEN_FILE)
-    return true;
-
-  return ![[NSWorkspace sharedWorkspace] isFilePackageAtPath:filename];
-}
-
 bool SelectFileDialogImpl::HasMultipleFileTypeChoicesImpl() {
   return hasMultipleFileTypeChoices_;
 }
 
 @implementation SelectFileDialogBridge
 
 - (id)initWithSelectFileDialogImpl:(SelectFileDialogImpl*)s {
   self = [super init];
   if (self != nil) {
     selectFileDialogImpl_ = s;
@@ skipping 50 matching lines @@
                                          paths,
                                          index);
   [panel release];
 }
 
 - (BOOL)panel:(id)sender shouldShowFilename:(NSString *)filename {
   return selectFileDialogImpl_->ShouldEnableFilename(sender, filename);
 }
 
 @end