Skip to content

GitLab

T
tangled
Commit 16b61e5e authored by flackr@chromium.org's avatar flackr@chromium.org
Browse files
Options

Restore <img> src values now that grit converts these. 

BUG=135179
TEST=Run chrome with --force-device-scale-factor=2 and ensure that high DPI images are used on these pages (i.e. the logo on chrome://chrome/help/)


Review URL: https://chromiumcodereview.appspot.com/10830051

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148804 0039d316-1c4b-4281-b951-d872f2087c98
parent 56955a78
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 24 deletions
chrome/browser/resources/about_version.html
View file @ 16b61e5e
...@@ -21,8 +21,13 @@ about:version template page ...@@ -21,8 +21,13 @@ about:version template page
<body> <body>
<div id="outer"> <div id="outer">
<div id="logo"> <div id="logo">
<!-- TODO: Revert back to src= once http://crbug.com/135179 is fixed --> <if expr="pp_ifdef('android')">
<img id="logo-img"> <!-- Android does not support themes. -->
<img src="../../app/theme/default_100_percent/%DISTRIBUTION%/product_logo.png">
</if>
<if expr="not pp_ifdef('android')">
<img src="chrome://theme/IDR_PRODUCT_LOGO">
</if>
<div id="company" i18n-content="company"></div> <div id="company" i18n-content="company"></div>
<div id="copyright" i18n-content="copyright"></div> <div id="copyright" i18n-content="copyright"></div>
</div> </div>
......
chrome/browser/resources/about_version_android.css
View file @ 16b61e5e
...@@ -16,9 +16,3 @@ ...@@ -16,9 +16,3 @@
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
} }
#logo-img {
/* Android does not support themes and can not use IDR_PRODUCT_LOGO. */
content:
url(../../app/theme/default_100_percent/%DISTRIBUTION%/product_logo.png);
}
chrome/browser/resources/help/help.css
View file @ 16b61e5e
...@@ -13,11 +13,6 @@ body { ...@@ -13,11 +13,6 @@ body {
margin-top: 10px; margin-top: 10px;
} }
#help-product-logo {
/* TODO: Remove once http://crbug.com/135179 is fixed */
content: url('chrome://theme/IDR_PRODUCT_LOGO_32');
}
#product-description { #product-description {
-webkit-margin-start: 10px; -webkit-margin-start: 10px;
} }
......
chrome/browser/resources/help/help.html
View file @ 16b61e5e
...@@ -18,8 +18,7 @@ ...@@ -18,8 +18,7 @@
<h1 i18n-content="aboutTitle"></h1> <h1 i18n-content="aboutTitle"></h1>
</header> </header>
<div id="about-container"> <div id="about-container">
<!-- TODO: Revert back to src= once http://crbug.com/135179 is fixed --> <img src="chrome://theme/IDR_PRODUCT_LOGO_32">
<img id="help-product-logo">
<div id="product-description"> <div id="product-description">
<h2 i18n-content="aboutProductTitle"></h2> <h2 i18n-content="aboutProductTitle"></h2>
<span i18n-content="aboutProductDescription"></span> <span i18n-content="aboutProductDescription"></span>
......
chrome/browser/resources/ntp4/new_tab.css
View file @ 16b61e5e
...@@ -190,8 +190,6 @@ html[dir='rtl'] #attribution { ...@@ -190,8 +190,6 @@ html[dir='rtl'] #attribution {
} }
#logo-img { #logo-img {
/* TODO(thakis): Remove once http://crbug.com/135179 is fixed */
content: url('chrome://theme/IDR_PRODUCT_LOGO');
margin-top: 4px; margin-top: 4px;
} }
......
chrome/browser/resources/ntp4/new_tab.html
View file @ 16b61e5e
...@@ -102,8 +102,7 @@ ...@@ -102,8 +102,7 @@
<div id="footer"> <div id="footer">
<div id="footer-border"></div> <div id="footer-border"></div>
<div id="footer-content"> <div id="footer-content">
<!-- TODO: Revert back to src= once http://crbug.com/135179 is fixed --> <img id="logo-img" src="chrome://theme/IDR_PRODUCT_LOGO">
<img id="logo-img">
<ul id="dot-list"> <ul id="dot-list">
</ul> </ul>
......
chrome/browser/resources/shared/css/about_version.css
View file @ 16b61e5e
...@@ -40,11 +40,6 @@ body { ...@@ -40,11 +40,6 @@ body {
width: 180px; width: 180px;
} }
#logo-img {
/* TODO: Remove once http://crbug.com/135179 is fixed */
content: url('chrome://theme/IDR_PRODUCT_LOGO');
}
#company { #company {
font-size: 0.7em; font-size: 0.7em;
text-align: right; text-align: right;
......
chrome/browser/ui/webui/about_ui.cc
View file @ 16b61e5e
...@@ -70,6 +70,10 @@ ...@@ -70,6 +70,10 @@
#include "webkit/glue/webkit_glue.h" #include "webkit/glue/webkit_glue.h"
#include "webkit/plugins/webplugininfo.h" #include "webkit/plugins/webplugininfo.h"
#if defined(ENABLE_THEMES)
#include "chrome/browser/ui/webui/theme_source.h"
#endif
#if defined(OS_LINUX) || defined(OS_OPENBSD) #if defined(OS_LINUX) || defined(OS_OPENBSD)
#include "content/public/browser/zygote_host_linux.h" #include "content/public/browser/zygote_host_linux.h"
#include "content/public/common/sandbox_linux.h" #include "content/public/common/sandbox_linux.h"
...@@ -1381,6 +1385,13 @@ std::string AboutUIHTMLSource::GetMimeType(const std::string& path) const { ...@@ -1381,6 +1385,13 @@ std::string AboutUIHTMLSource::GetMimeType(const std::string& path) const {
AboutUI::AboutUI(content::WebUI* web_ui, const std::string& name) AboutUI::AboutUI(content::WebUI* web_ui, const std::string& name)
: WebUIController(web_ui) { : WebUIController(web_ui) {
Profile* profile = Profile::FromWebUI(web_ui); Profile* profile = Profile::FromWebUI(web_ui);
#if defined(ENABLE_THEMES)
// Set up the chrome://theme/ source.
ThemeSource* theme = new ThemeSource(profile);
ChromeURLDataManager::AddDataSource(profile, theme);
#endif
ChromeURLDataManager::DataSource* source = ChromeURLDataManager::DataSource* source =
new AboutUIHTMLSource(name, profile); new AboutUIHTMLSource(name, profile);
if (source) { if (source) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment