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

Unified Diff: chrome/browser/chrome_content_browser_client.cc

Issue 10808006: Move printing.* prefs from local state to profile (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased just in case as the CL is a few days old now plus I got my branches all mixed up a bit. Created 8 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/browser_process_impl.cc ('k') | chrome/browser/prefs/browser_prefs.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 46577411e0e026853a2c6eda06ec0901ce3e1d7d..535e0d91bf58c22cecb91df6d5f71d9e5efb3d88 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -449,7 +449,7 @@ void ChromeContentBrowserClient::RenderProcessHostCreated(
id, profile, profile->GetRequestContextForRenderProcess(id)));
host->GetChannel()->AddFilter(new PluginInfoMessageFilter(id, profile));
#if defined(ENABLE_PRINTING)
- host->GetChannel()->AddFilter(new PrintingMessageFilter(id));
+ host->GetChannel()->AddFilter(new PrintingMessageFilter(id, profile));
#endif
host->GetChannel()->AddFilter(
new SearchProviderInstallStateMessageFilter(id, profile));
@@ -793,13 +793,9 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
command_line->AppendSwitch(
switches::kDisableClientSidePhishingDetection);
}
- }
- {
- PrefService* local_state = g_browser_process->local_state();
- if (local_state &&
- !local_state->GetBoolean(prefs::kPrintPreviewDisabled)) {
+
+ if (!prefs->GetBoolean(prefs::kPrintPreviewDisabled))
command_line->AppendSwitch(switches::kRendererPrintPreview);
- }
}
// Please keep this in alphabetical order.
« no previous file with comments | « chrome/browser/browser_process_impl.cc ('k') | chrome/browser/prefs/browser_prefs.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698