chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc - Issue 10808006: Move printing.* prefs from local state to profile

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/webui/chrome_web_ui_controller_factory.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:

Index: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

index dcfb73293d72ad40c648693274070b04d84116aa..e65f5a79d0054ef3d4e2418d8f10892ec9b91b34 100644

--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

@@ -6,7 +6,6 @@

#include "base/command_line.h"

#include "chrome/browser/about_flags.h"

-#include "chrome/browser/browser_process.h"

#include "chrome/browser/extensions/extension_service.h"

#include "chrome/browser/extensions/extension_web_ui.h"

#include "chrome/browser/history/history_types.h"

@@ -255,10 +254,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,

#endif

#if defined(ENABLE_PRINTING)

if (url.host() == chrome::kChromeUIPrintHost &&

- !g_browser_process->local_state()->GetBoolean(

- prefs::kPrintPreviewDisabled)) {

+ !profile->GetPrefs()->GetBoolean(prefs::kPrintPreviewDisabled))

return &NewWebUI<PrintPreviewUI>;

- }

#endif

#if defined(OS_WIN)

if (url.host() == chrome::kChromeUIConflictsHost)