commit 5053d4099a9a91cd5800ddcfb7669413b785006c
author jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Wed Jan 23 05:19:26 2013
committer jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Wed Jan 23 05:19:26 2013
tree 134bc65480c9bf35328e12911504226e0777c457
parent 011563e2384f18d5d02df4f71fe6a04e60edad6f

Move web_ui_util.* from chrome\browser\ui\webui to ui\webui so that they can be used by webui pages outside of chrome.

BUG=169170
Review URL: https://codereview.chromium.org/12052034

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@178253 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/ui/webui/theme_source.cc

diff --git a/chrome/browser/ui/webui/theme_source.cc b/chrome/browser/ui/webui/theme_source.cc
index 9a2e21344..d43ef38 100644
--- a/chrome/browser/ui/webui/theme_source.cc
+++ b/chrome/browser/ui/webui/theme_source.cc
@@ -13,13 +13,13 @@
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/webui/ntp/ntp_resource_cache.h"
 #include "chrome/browser/ui/webui/ntp/ntp_resource_cache_factory.h"
-#include "chrome/browser/ui/webui/web_ui_util.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
 #include "googleurl/src/gurl.h"
 #include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/theme_provider.h"
+#include "ui/webui/web_ui_util.h"
 
 using content::BrowserThread;
 
@@ -59,9 +59,9 @@
   // Default scale factor if not specified.
   ui::ScaleFactor scale_factor;
   std::string uncached_path;
-  web_ui_util::ParsePathAndScale(GURL(GetThemePath() + path),
-                                 &uncached_path,
-                                 &scale_factor);
+  webui::ParsePathAndScale(GURL(GetThemePath() + path),
+                           &uncached_path,
+                           &scale_factor);
 
   if (uncached_path == kNewTabCSSPath ||
       uncached_path == kNewIncognitoTabCSSPath) {
@@ -86,8 +86,7 @@
 
 std::string ThemeSource::GetMimeType(const std::string& path) const {
   std::string uncached_path;
-  web_ui_util::ParsePathAndScale(GURL(GetThemePath() + path),
-                                 &uncached_path, NULL);
+  webui::ParsePathAndScale(GURL(GetThemePath() + path), &uncached_path, NULL);
 
   if (uncached_path == kNewTabCSSPath ||
       uncached_path == kNewIncognitoTabCSSPath) {
@@ -100,8 +99,7 @@
 MessageLoop* ThemeSource::MessageLoopForRequestPath(
     const std::string& path) const {
   std::string uncached_path;
-  web_ui_util::ParsePathAndScale(GURL(GetThemePath() + path),
-                                 &uncached_path, NULL);
+  webui::ParsePathAndScale(GURL(GetThemePath() + path), &uncached_path, NULL);
 
   if (uncached_path == kNewTabCSSPath ||
       uncached_path == kNewIncognitoTabCSSPath) {