Remove NOTIFICATION_RENDER_VIEW_HOST_CHANGED.

chrome/browser/file_select_helper.h

 // 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.
 
 #ifndef CHROME_BROWSER_FILE_SELECT_HELPER_H_
 #define CHROME_BROWSER_FILE_SELECT_HELPER_H_
 
 #include <map>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
+#include "content/public/browser/web_contents_observer.h"
 #include "content/public/common/file_chooser_params.h"
 #include "net/base/directory_lister.h"
 #include "ui/shell_dialogs/select_file_dialog.h"
 
 class Profile;
 
 namespace content {
 struct FileChooserFileInfo;
 class RenderViewHost;
 class WebContents;
 }
 
 namespace ui {
 struct SelectedFileInfo;
 }
 
 // This class handles file-selection requests coming from WebUI elements
 // (via the extensions::ExtensionHost class). It implements both the
 // initialisation and listener functions for file-selection dialogs.
-class FileSelectHelper
-    : public base::RefCountedThreadSafe<FileSelectHelper>,
-      public ui::SelectFileDialog::Listener,
-      public content::NotificationObserver {
+class FileSelectHelper : public base::RefCountedThreadSafe<FileSelectHelper>,
+                         public ui::SelectFileDialog::Listener,
+                         public content::WebContentsObserver,
+                         public content::NotificationObserver {
  public:
 
   // Show the file chooser dialog.
   static void RunFileChooser(content::WebContents* tab,
                              const content::FileChooserParams& params);
 
   // Enumerates all the files in directory.
   static void EnumerateDirectory(content::WebContents* tab,
                                  int request_id,
                                  const base::FilePath& path);
@@ skipping 50 matching lines @@
   void MultiFilesSelectedWithExtraInfo(
       const std::vector<ui::SelectedFileInfo>& files,
       void* params) override;
   void FileSelectionCanceled(void* params) override;
 
   // content::NotificationObserver overrides.
   void Observe(int type,
                const content::NotificationSource& source,
                const content::NotificationDetails& details) override;
 
+  // content::WebContentsObserver overrides.
+  void RenderViewHostChanged(content::RenderViewHost* old_host,
+                             content::RenderViewHost* new_host) override;
+  void WebContentsDestroyed() override;
+
   void EnumerateDirectory(int request_id,
                           content::RenderViewHost* render_view_host,
                           const base::FilePath& path);
 
   // Kicks off a new directory enumeration.
   void StartNewEnumeration(const base::FilePath& path,
                            int request_id,
                            content::RenderViewHost* render_view_host);
 
   // Callbacks from directory enumeration.
@@ skipping 30 matching lines @@
       const std::vector<ui::SelectedFileInfo>& files);
 
   // Sends the result to the render process, and call |RunFileChooserEnd|.
   void NotifyRenderViewHostAndEndAfterConversion(
       const std::vector<content::FileChooserFileInfo>& list);
 
   // Schedules the deletion of the files in |temporary_files_| and clears the
   // vector.
   void DeleteTemporaryFiles();
 
+  // Cleans up when the RenderViewHost of our WebContents changes.
+  void CleanUpOnRenderViewHostChange();
+
   // Helper method to get allowed extensions for select file dialog from
   // the specified accept types as defined in the spec:
   //   http://whatwg.org/html/number-state.html#attr-input-accept
   // |accept_types| contains only valid lowercased MIME types or file extensions
   // beginning with a period (.).
   static scoped_ptr<ui::SelectFileDialog::FileTypeInfo>
       GetFileTypesFromAcceptType(
           const std::vector<base::string16>& accept_types);
 
   // Check the accept type is valid. It is expected to be all lower case with
@@ skipping 28 matching lines @@
   content::NotificationRegistrar notification_registrar_;
 
   // Temporary files only used on OSX. This class is responsible for deleting
   // these files when they are no longer needed.
   std::vector<base::FilePath> temporary_files_;
 
   DISALLOW_COPY_AND_ASSIGN(FileSelectHelper);
 };
 
 #endif  // CHROME_BROWSER_FILE_SELECT_HELPER_H_