Merge SavePackageFilePicker{,ChromeOS}

chrome/browser/ui/prefs/prefs_tab_helper.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/prefs/prefs_tab_helper.h"
 
 #include <string>
 
 #include "base/prefs/overlay_user_pref_store.h"
 #include "base/prefs/pref_service.h"
@@ skipping 464 matching lines @@
 PrefsTabHelper::~PrefsTabHelper() {
 }
 
 // static
 void PrefsTabHelper::InitIncognitoUserPrefStore(
     OverlayUserPrefStore* pref_store) {
   // List of keys that cannot be changed in the user prefs file by the incognito
   // profile.  All preferences that store information about the browsing history
   // or behavior of the user should have this property.
   pref_store->RegisterOverlayPref(prefs::kBrowserWindowPlacement);
+  pref_store->RegisterOverlayPref(prefs::kSaveFileDefaultDirectory);
 #if defined(OS_ANDROID) || defined(OS_IOS)
   pref_store->RegisterOverlayPref(prefs::kProxy);
 #endif  // defined(OS_ANDROID) || defined(OS_IOS)
 }
 
 // static
 void PrefsTabHelper::RegisterUserPrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   WebPreferences pref_defaults;
   registry->RegisterBooleanPref(
@@ skipping 218 matching lines @@
       WebPreferences web_prefs =
           web_contents_->GetRenderViewHost()->GetWebkitPreferences();
       OverrideFontFamily(&web_prefs, generic_family, script, std::string());
       web_contents_->GetRenderViewHost()->UpdateWebkitPreferences(web_prefs);
       return;
     }
   }
 
   UpdateWebPreferences();
 }