Modified printing to no longer store its own save path.

chrome/browser/ui/webui/print_preview/print_preview_handler.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/print_preview/print_preview_handler.h"
 
 #include <ctype.h>
 #include <stddef.h>
 
 #include <map>
@@ skipping 16 matching lines @@
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/task_runner_util.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/values.h"
 #include "build/build_config.h"
 #include "chrome/browser/app_mode/app_mode_utils.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/download/download_prefs.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/printing/print_dialog_cloud.h"
 #include "chrome/browser/printing/print_error_dialog.h"
 #include "chrome/browser/printing/print_job_manager.h"
 #include "chrome/browser/printing/print_preview_dialog_controller.h"
 #include "chrome/browser/printing/print_view_manager.h"
 #include "chrome/browser/printing/printer_manager_dialog.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/gaia_cookie_manager_service_factory.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
@@ skipping 1303 matching lines @@
 void PrintPreviewHandler::SelectFile(const base::FilePath& default_filename,
                                      bool prompt_user) {
   if (prompt_user) {
     ChromeSelectFilePolicy policy(GetInitiator());
     if (!policy.CanOpenSelectFileDialog()) {
       policy.SelectFileDenied();
       return ClosePreviewDialog();
     }
   }
 
-  // Initializing |save_path_| if it is not already initialized.
+  // Get save location from Download Preferences.
   printing::StickySettings* sticky_settings = GetStickySettings();

[Lei Zhang, 2016/07/13 22:16:09]

Move this down to line 1365, so it is closer to where it's used, or just don't
bother with the pointer and just call GetStickySettings()-Foo(), now that we
only use it in a single place.

Ditto in PrintPreviewHandler::FileSelected() below.

-  if (!sticky_settings->save_path()) {
-    // Allowing IO operation temporarily. It is ok to do so here because
-    // the select file dialog performs IO anyway in order to display the
-    // folders and also it is modal.
-    base::ThreadRestrictions::ScopedAllowIO allow_io;

[Lei Zhang, 2016/07/13 22:20:52]

The #includes for base/path_service.h, base/threading/thread_restrictions.h and
chrome/common/chrome_paths.h are also no longer needed.

-    base::FilePath file_path;
-    PathService::Get(chrome::DIR_USER_DOCUMENTS, &file_path);
-    sticky_settings->StoreSavePath(file_path);
-    sticky_settings->SaveInPrefs(Profile::FromBrowserContext(
-        preview_web_contents()->GetBrowserContext())->GetPrefs());
-  }
-
+  DownloadPrefs* download_prefs = DownloadPrefs::FromBrowserContext(
+      preview_web_contents()->GetBrowserContext());
+  base::FilePath file_path = download_prefs->SaveFilePath();
+  sticky_settings->SaveInPrefs(Profile::FromBrowserContext(
+      preview_web_contents()->GetBrowserContext())->GetPrefs());
   // Handle the no prompting case. Like the dialog prompt, this function
   // returns and eventually FileSelected() gets called.
   if (!prompt_user) {
     base::PostTaskAndReplyWithResult(
         BrowserThread::GetBlockingPool(),
         FROM_HERE,
         base::Bind(&GetUniquePath,
-                   sticky_settings->save_path()->Append(default_filename)),
+                   download_prefs->SaveFilePath().Append(default_filename)),
         base::Bind(&PrintPreviewHandler::OnGotUniqueFileName,
                    weak_factory_.GetWeakPtr()));
     return;
   }
 
   // Otherwise prompt the user.
   ui::SelectFileDialog::FileTypeInfo file_type_info;
   file_type_info.extensions.resize(1);
   file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("pdf"));
 
   select_file_dialog_ =
       ui::SelectFileDialog::Create(this, nullptr /*policy already checked*/);
   select_file_dialog_->SelectFile(
       ui::SelectFileDialog::SELECT_SAVEAS_FILE,
       base::string16(),
-      sticky_settings->save_path()->Append(default_filename),
+      download_prefs->SaveFilePath().Append(default_filename),
       &file_type_info,
       0,
       base::FilePath::StringType(),
       platform_util::GetTopLevel(preview_web_contents()->GetNativeView()),
       NULL);
 }
 
 void PrintPreviewHandler::OnGotUniqueFileName(const base::FilePath& path) {
   FileSelected(path, 0, nullptr);
 }
 
 void PrintPreviewHandler::OnPrintPreviewFailed() {
   if (reported_failed_preview_)
     return;
   reported_failed_preview_ = true;
   ReportUserActionHistogram(PREVIEW_FAILED);
 }
 
 #if defined(ENABLE_BASIC_PRINTING)
 void PrintPreviewHandler::ShowSystemDialog() {
   HandleShowSystemDialog(NULL);
 }
 #endif  // ENABLE_BASIC_PRINTING
 
 void PrintPreviewHandler::FileSelected(const base::FilePath& path,
                                        int /* index */,
                                        void* /* params */) {
-  // Updating |save_path_| to the newly selected folder.
+  // Update downloads location and save sticky settings.
   printing::StickySettings* sticky_settings = GetStickySettings();
-  sticky_settings->StoreSavePath(path.DirName());
+  DownloadPrefs* download_prefs = DownloadPrefs::FromBrowserContext(
+      preview_web_contents()->GetBrowserContext());
+  download_prefs->SetSaveFilePath(path.DirName());
   sticky_settings->SaveInPrefs(Profile::FromBrowserContext(
       preview_web_contents()->GetBrowserContext())->GetPrefs());
   web_ui()->CallJavascriptFunctionUnsafe("fileSelectionCompleted");
   print_to_pdf_path_ = path;
   PostPrintToPdfTask();
 }
 
 void PrintPreviewHandler::PostPrintToPdfTask() {
   scoped_refptr<base::RefCountedBytes> data;
   base::string16 title;
@@ skipping 327 matching lines @@
 
 void PrintPreviewHandler::UnregisterForGaiaCookieChanges() {
   if (gaia_cookie_manager_service_)
     gaia_cookie_manager_service_->RemoveObserver(this);
 }
 
 void PrintPreviewHandler::SetPdfSavedClosureForTesting(
     const base::Closure& closure) {
   pdf_file_saved_closure_ = closure;
 }