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

Unified Diff: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

Issue 9695038: Android: Remove a few more printing sources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: better rebase Created 8 years, 9 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 | « no previous file | chrome/test/base/testing_browser_process.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 17988c6a28d471bb045d58b7f4ddc00037f1db36..ae8cbdf8d14e00c058cdcd07718543275f22c668 100644
--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -236,6 +236,12 @@ WebUIFactoryFunction GetWebUIFactoryFunction(content::WebUI* web_ui,
return &NewWebUI<options2::OptionsUI>;
if (url.host() == chrome::kChromeUISettingsHost)
return &NewWebUI<OptionsUI>;
+ // Android doesn't support print/print-preview
+ if (url.host() == chrome::kChromeUIPrintHost &&
+ !g_browser_process->local_state()->GetBoolean(
+ prefs::kPrintPreviewDisabled)) {
+ return &NewWebUI<PrintPreviewUI>;
+ }
#endif
#if defined(OS_WIN)
if (url.host() == chrome::kChromeUIConflictsHost)
@@ -288,12 +294,6 @@ WebUIFactoryFunction GetWebUIFactoryFunction(content::WebUI* web_ui,
}
#endif
- if (url.host() == chrome::kChromeUIPrintHost &&
- !g_browser_process->local_state()->GetBoolean(
- prefs::kPrintPreviewDisabled)) {
- return &NewWebUI<PrintPreviewUI>;
- }
-
#if !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
if (url.host() == chrome::kChromeUISyncPromoHost) {
// If the sync promo page is enabled then use the sync promo WebUI otherwise
« no previous file with comments | « no previous file | chrome/test/base/testing_browser_process.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698