Pull the file picker code out of TabContents.

chrome/browser/file_select_helper.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/file_select_helper.h"
 
 #include <string>
 
 #include "base/file_util.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/common/render_messages.h"
 #include "chrome/common/render_messages_params.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/render_widget_host_view.h"
+#include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/notification_details.h"
 #include "content/common/notification_source.h"
 #include "grit/generated_resources.h"
 #include "net/base/mime_util.h"
 #include "ui/base/l10n/l10n_util.h"
 
 FileSelectHelper::FileSelectHelper(Profile* profile)
     : profile_(profile),
       render_view_host_(NULL),
       select_file_dialog_(),
@@ skipping 157 matching lines @@
   if (description_id) {
     file_type->extension_description_overrides.push_back(
         l10n_util::GetStringUTF16(description_id));
   }
 
   return file_type.release();
 }
 
 void FileSelectHelper::RunFileChooser(
     RenderViewHost* render_view_host,
-    const ViewHostMsg_RunFileChooser_Params &params) {
+    const ViewHostMsg_RunFileChooser_Params& params) {
   DCHECK(!render_view_host_);
   render_view_host_ = render_view_host;
   notification_registrar_.RemoveAll();
   notification_registrar_.Add(this,
                               NotificationType::RENDER_WIDGET_HOST_DESTROYED,
                               Source<RenderViewHost>(render_view_host));
 
   if (!select_file_dialog_.get())
     select_file_dialog_ = SelectFileDialog::Create(this);
 
@@ skipping 32 matching lines @@
                                   NULL);
 }
 
 void FileSelectHelper::Observe(NotificationType type,
                                const NotificationSource& source,
                                const NotificationDetails& details) {
   DCHECK(type == NotificationType::RENDER_WIDGET_HOST_DESTROYED);
   DCHECK(Details<RenderViewHost>(details).ptr() == render_view_host_);
   render_view_host_ = NULL;
 }
+
+FileSelectObserver::FileSelectObserver(TabContents* tab_contents)
+    : TabContentsObserver(tab_contents) {
+}
+
+FileSelectObserver::~FileSelectObserver() {
+}
+
+bool FileSelectObserver::OnMessageReceived(const IPC::Message& message) {
+  bool handled = true;
+  IPC_BEGIN_MESSAGE_MAP(FileSelectObserver, message)
+    IPC_MESSAGE_HANDLER(ViewHostMsg_RunFileChooser, OnRunFileChooser)
+    IPC_MESSAGE_UNHANDLED(handled = false)
+  IPC_END_MESSAGE_MAP()
+
+  return handled;
+}
+
+void FileSelectObserver::OnRunFileChooser(
+    const ViewHostMsg_RunFileChooser_Params& params) {
+  if (file_select_helper_.get() == NULL)

[jam, 2011/03/11 17:03:58]

nit: usual style is to drop the "== NULL"

[Avi (use Gerrit), 2011/03/11 17:24:41]

Done.

+    file_select_helper_.reset(new FileSelectHelper(tab_contents()->profile()));
+  file_select_helper_->RunFileChooser(tab_contents()->render_view_host(),
+                                      params);
+}