Media Galleries: Use the same last directory entry as file_system_api.

chrome/browser/media_galleries/media_galleries_dialog_controller.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/media_galleries/media_galleries_dialog_controller.h"
 
 #include "base/base_paths.h"
 #include "base/path_service.h"
 #include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/extensions/api/file_system/file_system_api.h"
+#include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/media_galleries/media_file_system_registry.h"
 #include "chrome/browser/media_galleries/media_galleries_histograms.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/storage_monitor/storage_info.h"
 #include "chrome/browser/storage_monitor/storage_monitor.h"
 #include "chrome/browser/ui/chrome_select_file_policy.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/permissions/media_galleries_permission.h"
 #include "chrome/common/extensions/permissions/permissions_data.h"
 #include "content/public/browser/web_contents.h"
@@ skipping 59 matching lines @@
 
 MediaGalleriesDialogController::MediaGalleriesDialogController(
     content::WebContents* web_contents,
     const Extension& extension,
     const base::Closure& on_finish)
       : web_contents_(web_contents),
         extension_(&extension),
         on_finish_(on_finish) {
   preferences_ =
       g_browser_process->media_file_system_registry()->GetPreferences(
-          Profile::FromBrowserContext(web_contents_->GetBrowserContext()));
+          GetProfile());
   // Passing unretained pointer is safe, since the dialog controller
   // is self-deleting, and so won't be deleted until it can be shown
   // and then closed.
   preferences_->EnsureInitialized(
       base::Bind(&MediaGalleriesDialogController::OnPreferencesInitialized,
                  base::Unretained(this)));
 
   gallery_menu_model_.reset(new GalleryContextMenuModel(this));
   ui::SimpleMenuModel* menu_model =
       new ui::SimpleMenuModel(gallery_menu_model_.get());
@@ skipping 100 matching lines @@
 }
 
 MediaGalleriesDialogController::GalleryPermissionsVector
 MediaGalleriesDialogController::UnattachedPermissions() const {
   GalleryPermissionsVector unattached;
   FillPermissions(false, &unattached);
   return unattached;
 }
 
 void MediaGalleriesDialogController::OnAddFolderClicked() {
-  base::FilePath desktop;
-  PathService::Get(base::DIR_USER_DESKTOP, &desktop);
+  base::FilePath default_path =
+      extensions::file_system_api::GetLastChooseEntryDirectory(
+          extensions::ExtensionPrefs::Get(GetProfile()), extension_->id());
+  if (default_path.empty())
+    PathService::Get(base::DIR_USER_DESKTOP, &default_path);
   select_folder_dialog_ =
       ui::SelectFileDialog::Create(this, new ChromeSelectFilePolicy(NULL));
   select_folder_dialog_->SelectFile(
       ui::SelectFileDialog::SELECT_FOLDER,
       l10n_util::GetStringUTF16(IDS_MEDIA_GALLERIES_DIALOG_ADD_GALLERY_TITLE),
-      desktop,
+      default_path,
       NULL,
       0,
       base::FilePath::StringType(),
       web_contents_->GetView()->GetTopLevelNativeWindow(),
       NULL);
 }
 
 void MediaGalleriesDialogController::DidToggleGalleryId(
     MediaGalleryPrefId gallery_id,
     bool enabled) {
@@ skipping 50 matching lines @@
   delete this;
 }
 
 content::WebContents* MediaGalleriesDialogController::web_contents() {
   return web_contents_;
 }
 
 void MediaGalleriesDialogController::FileSelected(const base::FilePath& path,
                                                   int /*index*/,
                                                   void* /*params*/) {
+  extensions::file_system_api::SetLastChooseEntryDirectory(
+      extensions::ExtensionPrefs::Get(GetProfile()),
+      extension_->id(),
+      path);
+
   // Try to find it in the prefs.
   MediaGalleryPrefInfo gallery;
   bool gallery_exists = preferences_->LookUpGalleryByPath(path, &gallery);
   if (gallery_exists && gallery.type != MediaGalleryPrefInfo::kBlackListed) {
     // The prefs are in sync with |known_galleries_|, so it should exist in
     // |known_galleries_| as well. User selecting a known gallery effectively
     // just sets the gallery to permitted.
     DCHECK(ContainsKey(known_galleries_, gallery.pref_id));
     dialog_->UpdateGalleries();
     return;
@@ skipping 159 matching lines @@
     const std::string& device_id) {
   dialog_->UpdateGalleries();
 }
 
 ui::MenuModel* MediaGalleriesDialogController::GetContextMenuModel(
     MediaGalleryPrefId id) {
   gallery_menu_model_->set_media_gallery_pref_id(id);
   return context_menu_model_.get();
 }
 
+Profile* MediaGalleriesDialogController::GetProfile() {
+  return Profile::FromBrowserContext(web_contents_->GetBrowserContext());
+}
+
 // MediaGalleries dialog -------------------------------------------------------
 
 MediaGalleriesDialog::~MediaGalleriesDialog() {}