Revert 102113 - Aura: Use extension-based file picker from CrOS for pure-views builds.

chrome/browser/ui/views/file_manager_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/views/file_manager_dialog.h"
 
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "chrome/browser/extensions/extension_file_browser_private_api.h"
 #include "chrome/browser/extensions/extension_host.h"
@@ skipping 55 matching lines @@
     LOG(WARNING) << "Pending dialog not found " << tab_id;
     return NULL;
   }
   return it->second.dialog_.get();
 }
 
 }  // namespace
 
 // Linking this implementation of SelectFileDialog::Create into the target
 // selects FileManagerDialog as the dialog of choice.
-// TODO(jamescook): Move this into a new file shell_dialogs_chromeos.cc
 // static
 SelectFileDialog* SelectFileDialog::Create(Listener* listener) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   return new FileManagerDialog(listener);
 }
 
 /////////////////////////////////////////////////////////////////////////////
 
 FileManagerDialog::FileManagerDialog(Listener* listener)
     : SelectFileDialog(listener),
@@ skipping 89 matching lines @@
     NOTREACHED() << "Can't find owning browser";
     return;
   }
 
   FilePath virtual_path;
   if (!FileManagerUtil::ConvertFileToRelativeFileSystemPath(
           owner_browser->profile(), default_path, &virtual_path)) {
     virtual_path = FilePath();
   }
 
+  // Connect our listener to FileDialogFunction's per-tab callbacks.
+  TabContentsWrapper* tab = owner_browser->GetSelectedTabContentsWrapper();
+  int32 tab_id = (tab ? tab->restore_tab_helper()->session_id().id() : 0);
+  PendingDialog::Add(tab_id, this);
+
   GURL file_browser_url = FileManagerUtil::GetFileBrowserUrlWithParams(
       type, title, virtual_path, file_types, file_type_index,
       default_extension);
-  TabContentsWrapper* tab = owner_browser->GetSelectedTabContentsWrapper();
-  ExtensionDialog* dialog = ExtensionDialog::Show(file_browser_url,
+  extension_dialog_ = ExtensionDialog::Show(file_browser_url,
       owner_browser, tab->tab_contents(),
       kFileManagerWidth, kFileManagerHeight,
       this /* ExtensionDialog::Observer */);
-  if (!dialog) {
-    LOG(ERROR) << "Unable to create extension dialog";
-    return;
-  }
 
-  // Connect our listener to FileDialogFunction's per-tab callbacks.
-  int32 tab_id = (tab ? tab->restore_tab_helper()->session_id().id() : 0);
-  PendingDialog::Add(tab_id, this);
-
-  extension_dialog_ = dialog;
   params_ = params;
   tab_id_ = tab_id;
   owner_window_ = owner_window;
 }