Initial support for cloudprint in print preview

chrome/browser/ui/webui/chrome_web_ui_factory.cc

 // Copyright (c) 2011 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/webui/chrome_web_ui_factory.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/about_flags.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_web_ui.h"
@@ skipping 184 matching lines @@
     return &NewWebUI<chromeos::ProxySettingsUI>;
   if (url.host() == chrome::kChromeUIRegisterPageHost)
     return &NewWebUI<RegisterPageUI>;
   if (url.host() == chrome::kChromeUISimUnlockHost)
     return &NewWebUI<chromeos::SimUnlockUI>;
   if (url.host() == chrome::kChromeUISystemInfoHost)
     return &NewWebUI<SystemInfoUI>;
   if (url.host() == chrome::kChromeUIEnterpriseEnrollmentHost)
     return &NewWebUI<chromeos::EnterpriseEnrollmentUI>;
 #else
+  if (url.host() == chrome::kChromeUISettingsHost)

[Lei Zhang, 2011/06/09 21:23:30]

isn't this already on line 172?

[Albert Bodenhamer, 2011/06/10 01:29:36]

Good catch.  I think something went wrong with a merge and I missed it.

+    return &NewWebUI<OptionsUI>;
+#endif  // defined(OS_CHROMEOS)
+
   if (url.host() == chrome::kChromeUIPrintHost &&
       switches::IsPrintPreviewEnabled()) {
     return &NewWebUI<PrintPreviewUI>;
   }
-#endif  // defined(OS_CHROMEOS)
 
   if (url.spec() == chrome::kChromeUIConstrainedHTMLTestURL)
     return &NewWebUI<ConstrainedHtmlUI>;
 
   return NULL;
 }
 
 // When the test-type switch is set, return a TestType object, which should be a
 // subclass of Type. The logic is provided here in the traits class, rather than
 // in GetInstance() so that the choice is made only once, when the Singleton is
@@ skipping 133 matching lines @@
     return FlashUI::GetFaviconResourceBytes();
 
   if (page_url.host() == chrome::kChromeUISettingsHost)
     return OptionsUI::GetFaviconResourceBytes();
 
   if (page_url.host() == chrome::kChromeUIPluginsHost)
     return PluginsUI::GetFaviconResourceBytes();
 
   return NULL;
 }