Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(28)

Side by Side Diff: trunk/src/chrome/browser/profiles/profile_impl.cc

Issue 299273003: Revert 272587 "Remove kEnablePrintPreview now that the pdf plugi..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/profiles/profile_impl.h" 5 #include "chrome/browser/profiles/profile_impl.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after
346 std::string(), 346 std::string(),
347 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); 347 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
348 #if defined(ENABLE_PRINTING) 348 #if defined(ENABLE_PRINTING)
349 registry->RegisterBooleanPref( 349 registry->RegisterBooleanPref(
350 prefs::kPrintingEnabled, 350 prefs::kPrintingEnabled,
351 true, 351 true,
352 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 352 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
353 #endif 353 #endif
354 registry->RegisterBooleanPref( 354 registry->RegisterBooleanPref(
355 prefs::kPrintPreviewDisabled, 355 prefs::kPrintPreviewDisabled,
356 #if defined(GOOGLE_CHROME_BUILD)
356 false, 357 false,
358 #else
359 true,
360 #endif
357 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 361 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
358 registry->RegisterBooleanPref( 362 registry->RegisterBooleanPref(
359 prefs::kForceEphemeralProfiles, 363 prefs::kForceEphemeralProfiles,
360 false, 364 false,
361 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 365 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
362 366
363 // Initialize the cache prefs. 367 // Initialize the cache prefs.
364 registry->RegisterFilePathPref( 368 registry->RegisterFilePathPref(
365 prefs::kDiskCacheDir, 369 prefs::kDiskCacheDir,
366 base::FilePath(), 370 base::FilePath(),
(...skipping 986 matching lines...) Expand 10 before | Expand all | Expand 10 after
1353 PrefProxyConfigTracker* ProfileImpl::CreateProxyConfigTracker() { 1357 PrefProxyConfigTracker* ProfileImpl::CreateProxyConfigTracker() {
1354 #if defined(OS_CHROMEOS) 1358 #if defined(OS_CHROMEOS)
1355 if (chromeos::ProfileHelper::IsSigninProfile(this)) { 1359 if (chromeos::ProfileHelper::IsSigninProfile(this)) {
1356 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( 1360 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState(
1357 g_browser_process->local_state()); 1361 g_browser_process->local_state());
1358 } 1362 }
1359 #endif // defined(OS_CHROMEOS) 1363 #endif // defined(OS_CHROMEOS)
1360 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( 1364 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile(
1361 GetPrefs(), g_browser_process->local_state()); 1365 GetPrefs(), g_browser_process->local_state());
1362 } 1366 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698