Start consolidating cross-port file selection code into ui/base/dialogs.

chrome/browser/ui/webui/options2/chromeos/set_wallpaper_options_handler2.cc

 // 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/webui/options2/chromeos/set_wallpaper_options_handler2.h"
 
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/shell.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/ui/chrome_select_file_policy.h"
 #include "chrome/browser/ui/webui/options2/chromeos/wallpaper_thumbnail_source2.h"
 #include "chrome/browser/ui/webui/web_ui_util.h"
 #include "chrome/common/chrome_paths.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/views/widget/widget.h"
 
 namespace chromeos {
@@ skipping 139 matching lines @@
     web_ui()->CallJavascriptFunction("SetWallpaperOptions.setCustomImage");
   } else {
     SendLayoutOptions(ash::CENTER_CROPPED);
     web_ui()->CallJavascriptFunction("SetWallpaperOptions.setSelectedImage",
                                      image_url, is_random);
   }
 }
 
 void SetWallpaperOptionsHandler::HandleChooseFile(const ListValue* args) {
   DCHECK(args && args->empty());
-  if (!select_file_dialog_.get())
-    select_file_dialog_ = SelectFileDialog::Create(this);
+  select_file_dialog_ = SelectFileDialog::Create(
+      this, new ChromeSelectFilePolicy(web_ui()->GetWebContents()));
 
   FilePath downloads_path;
   if (!PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS, &downloads_path))
     NOTREACHED();
 
   // Static so we initialize it only once.
   CR_DEFINE_STATIC_LOCAL(SelectFileDialog::FileTypeInfo, file_type_info,
       (GetUserImageFileTypeInfo()));
 
   select_file_dialog_->SelectFile(SelectFileDialog::SELECT_OPEN_FILE,
                                   l10n_util::GetStringUTF16(IDS_DOWNLOAD_TITLE),
                                   downloads_path, &file_type_info, 0,
                                   FILE_PATH_LITERAL(""),
-                                  web_ui()->GetWebContents(),
                                   GetBrowserWindow(), NULL);
 }
 
 void SetWallpaperOptionsHandler::HandleLayoutChanged(const ListValue* args) {
   int selected_layout = ash::CENTER_CROPPED;
   if (!ExtractIntegerValue(args, &selected_layout))
     NOTREACHED() << "Could not read wallpaper layout from JSON argument";
 
   ash::WallpaperLayout layout =
       static_cast<ash::WallpaperLayout>(selected_layout);
@@ skipping 33 matching lines @@
 gfx::NativeWindow SetWallpaperOptionsHandler::GetBrowserWindow() const {
   Browser* browser =
       browser::FindBrowserWithProfile(Profile::FromWebUI(web_ui()));
   if (!browser)
     return NULL;
   return browser->window()->GetNativeWindow();
 }
 
 }  // namespace options2
 }  // namespace chromeos