summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-28 01:20:29 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-28 01:20:29 +0000
commitd1bbf2ea459715bb229268b4846a27ffa9773e70 (patch)
treef4b56b6c8d4669cdce23bb6e0ae51336cb07d0cf
parent13b94c9b8b91f1ef5ec810e880ac9bc9d9d18fcf (diff)
downloadchromium_src-d1bbf2ea459715bb229268b4846a27ffa9773e70.zip
chromium_src-d1bbf2ea459715bb229268b4846a27ffa9773e70.tar.gz
chromium_src-d1bbf2ea459715bb229268b4846a27ffa9773e70.tar.bz2
HiDPI icons for ssl error webui page
BUG=134372,123162 TEST=none TBR=flackr Review URL: https://chromiumcodereview.appspot.com/10673017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148860 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/browser_resources.grd10
-rw-r--r--chrome/browser/resources/2x/ssl_roadblock_icon.pngbin0 -> 4962 bytes
-rw-r--r--chrome/browser/resources/2x/twisty_closed.pngbin0 -> 1152 bytes
-rw-r--r--chrome/browser/resources/2x/twisty_closed_rtl.pngbin0 -> 1156 bytes
-rw-r--r--chrome/browser/resources/2x/twisty_open.pngbin0 -> 1136 bytes
5 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
index c7e3f0b..b45444d 100644
--- a/chrome/browser/browser_resources.grd
+++ b/chrome/browser/browser_resources.grd
@@ -18,14 +18,17 @@
<if expr="is_win">
<structure name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory.html" flattenhtml="true" type="chrome_html" />
</if>
+ <structure name="IDR_ABOUT_VERSION_HTML" file="resources\about_version.html" flattenhtml="true" allowexternalscript="true" type="chrome_html" />
+ <structure name="IDR_EXTENSIONS_HTML" file="resources\extensions\extensions.html" flattenhtml="true" type="chrome_html" />
<structure name="IDR_HELP_CSS" file="resources\help\help.css" flattenhtml="true" type="chrome_html" />
<structure name="IDR_HELP_HTML" file="resources\help\help.html" flattenhtml="true" type="chrome_html" />
- <structure name="IDR_EXTENSIONS_HTML" file="resources\extensions\extensions.html" flattenhtml="true" type="chrome_html" />
<structure name="IDR_NEW_TAB_4_HTML" file="resources\ntp4\new_tab.html" flattenhtml="true" type="chrome_html" />
<structure name="IDR_NEW_TAB_4_THEME_CSS" file="resources\ntp4\new_tab_theme.css" flattenhtml="true" type="chrome_html" />
<structure name="IDR_NEW_TAB_SEARCH_HTML" file="resources\ntp_search\new_tab.html" flattenhtml="true" type="chrome_html" />
<structure name="IDR_NEW_TAB_SEARCH_THEME_CSS" file="resources\ntp_search\new_tab_theme.css" flattenhtml="true" type="chrome_html" />
- <structure name="IDR_ABOUT_VERSION_HTML" file="resources\about_version.html" flattenhtml="true" allowexternalscript="true" type="chrome_html" />
+ <structure name="IDR_READER_OUT_OF_DATE_HTML" file="resources\reader_out_of_date.html" flattenhtml="true" type="chrome_html" />
+ <structure name="IDR_SSL_ERROR_HTML" file="resources\ssl_error.html" flattenhtml="true" type="chrome_html" />
+ <structure name="IDR_SSL_ROAD_BLOCK_HTML" file="resources\ssl_roadblock.html" flattenhtml="true" type="chrome_html" />
</structures>
<includes>
<if expr="is_win">
@@ -133,7 +136,6 @@
</if>
<include name="IDR_PROFILER_HTML" file="resources\profiler\profiler.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
<include name="IDR_PROFILER_JS" file="resources\profiler\profiler.js" flattenhtml="true" type="BINDATA" />
- <include name="IDR_READER_OUT_OF_DATE_HTML" file="resources\reader_out_of_date.html" flattenhtml="true" type="BINDATA" />
<include name="IDR_SAFE_BROWSING_MALWARE_BLOCK" file="resources\safe_browsing_malware_block.html" flattenhtml="true" type="BINDATA" />
<include name="IDR_SAFE_BROWSING_MULTIPLE_THREAT_BLOCK" file="resources\safe_browsing_multiple_threat_block.html" flattenhtml="true" type="BINDATA" />
<include name="IDR_SAFE_BROWSING_PHISHING_BLOCK" file="resources\safe_browsing_phishing_block.html" flattenhtml="true" type="BINDATA" />
@@ -142,8 +144,6 @@
<include name="IDR_SUGGESTIONS_INTERNALS_JS" file="resources\suggestions_internals\suggestions_internals.js" type="BINDATA" />
<include name="IDR_SUGGESTIONS_PAGE_CSS" file="resources\ntp4\suggestions_page.css" type="BINDATA" />
<include name="IDR_SUGGESTIONS_PAGE_JS" file="resources\ntp4\suggestions_page.js" type="BINDATA" />
- <include name="IDR_SSL_ERROR_HTML" file="resources\ssl_error.html" flattenhtml="true" type="BINDATA" />
- <include name="IDR_SSL_ROAD_BLOCK_HTML" file="resources\ssl_roadblock.html" flattenhtml="true" type="BINDATA" />
<include name="IDR_TRACING_HTML" file="..\..\third_party\trace-viewer\src\about_tracing.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
<include name="IDR_TRACING_JS" file="..\..\third_party\trace-viewer\src\about_tracing.js" flattenhtml="true" type="BINDATA" />
<include name="IDR_TRANSLATE_JS" file="resources\translate.js" type="BINDATA" />
diff --git a/chrome/browser/resources/2x/ssl_roadblock_icon.png b/chrome/browser/resources/2x/ssl_roadblock_icon.png
new file mode 100644
index 0000000..f94f2be
--- /dev/null
+++ b/chrome/browser/resources/2x/ssl_roadblock_icon.png
Binary files differ
diff --git a/chrome/browser/resources/2x/twisty_closed.png b/chrome/browser/resources/2x/twisty_closed.png
new file mode 100644
index 0000000..f01f848
--- /dev/null
+++ b/chrome/browser/resources/2x/twisty_closed.png
Binary files differ
diff --git a/chrome/browser/resources/2x/twisty_closed_rtl.png b/chrome/browser/resources/2x/twisty_closed_rtl.png
new file mode 100644
index 0000000..d660a51
--- /dev/null
+++ b/chrome/browser/resources/2x/twisty_closed_rtl.png
Binary files differ
diff --git a/chrome/browser/resources/2x/twisty_open.png b/chrome/browser/resources/2x/twisty_open.png
new file mode 100644
index 0000000..a1141d0
--- /dev/null
+++ b/chrome/browser/resources/2x/twisty_open.png
Binary files differ