summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
authorbenrg@chromium.org <benrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-15 20:16:15 +0000
committerbenrg@chromium.org <benrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-15 20:16:15 +0000
commitb07e606ec8cb041d0ce1e1f20e6013136bb93d15 (patch)
tree2e28d09a717aafee478c79415945ec6c1c1f5da0 /chrome/common
parent479cce780a26eedae06c79662968082c880b00df (diff)
downloadchromium_src-b07e606ec8cb041d0ce1e1f20e6013136bb93d15.zip
chromium_src-b07e606ec8cb041d0ce1e1f20e6013136bb93d15.tar.gz
chromium_src-b07e606ec8cb041d0ce1e1f20e6013136bb93d15.tar.bz2
Move shared file type images into chrome://theme/ scheme
These images are used by WebUI code (which uses 2x/ subdirectories for hi-dpi) and by C++ code (which uses the default_###_percent scheme). Move them to chrome/app/theme so that scaling will work in C++ code. drive.png was unmentioned in the grd file. I added IDR_FILE_MANAGER_IMG_FILETYPE_DRIVE. Some uses of the images in CSS/JS use only the 1x versions. I left these as-is. BUG=138965 TEST=Look at file manager and chrome://downloads in Linux chromeos build with --force-device-scale-factor=[12] Review URL: https://chromiumcodereview.appspot.com/10916305 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@157013 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r--chrome/common/url_constants.cc2
-rw-r--r--chrome/common/url_constants.h2
2 files changed, 4 insertions, 0 deletions
diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc
index 1f4f2b5..eb472a9 100644
--- a/chrome/common/url_constants.cc
+++ b/chrome/common/url_constants.cc
@@ -75,6 +75,7 @@ const char kChromeUISSLClientCertificateSelectorURL[] = "chrome://select-cert/";
const char kChromeUISyncPromoURL[] = "chrome://signin/";
const char kChromeUITaskManagerURL[] = "chrome://tasks/";
const char kChromeUITermsURL[] = "chrome://terms/";
+const char kChromeUIThemeURL[] = "chrome://theme/";
const char kChromeUIThumbnailURL[] = "chrome://thumb/";
const char kChromeUIUberURL[] = "chrome://chrome/";
const char kChromeUIUberFrameURL[] = "chrome://uber-frame/";
@@ -204,6 +205,7 @@ const char kChromeUISyncPromoHost[] = "signin";
const char kChromeUISyncResourcesHost[] = "syncresources";
const char kChromeUITaskManagerHost[] = "tasks";
const char kChromeUITermsHost[] = "terms";
+const char kChromeUIThemeHost[] = "theme";
const char kChromeUIThumbnailHost[] = "thumb";
const char kChromeUITouchIconHost[] = "touch-icon";
const char kChromeUITracingHost[] = "tracing";
diff --git a/chrome/common/url_constants.h b/chrome/common/url_constants.h
index 617eee2..69bbace 100644
--- a/chrome/common/url_constants.h
+++ b/chrome/common/url_constants.h
@@ -67,6 +67,7 @@ extern const char kChromeUISSLClientCertificateSelectorURL[];
extern const char kChromeUISyncPromoURL[];
extern const char kChromeUITaskManagerURL[];
extern const char kChromeUITermsURL[];
+extern const char kChromeUIThemeURL[];
extern const char kChromeUIThumbnailURL[];
extern const char kChromeUIUberURL[];
extern const char kChromeUIUberFrameURL[];
@@ -193,6 +194,7 @@ extern const char kChromeUISyncPromoHost[];
extern const char kChromeUISyncResourcesHost[];
extern const char kChromeUITaskManagerHost[];
extern const char kChromeUITermsHost[];
+extern const char kChromeUIThemeHost[];
extern const char kChromeUIThumbnailHost[];
extern const char kChromeUITouchIconHost[];
extern const char kChromeUITracingHost[];