chrome/browser/resources/about_version.html - Issue 10830051: Restore <img> src values now that grit converts these.

Side by Side Diff: chrome/browser/resources/about_version.html

Issue 10830051: Restore <img> src values now that grit converts these. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Ensure ThemeSource is loaded. Created 8 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

OLD	NEW
1 <!DOCTYPE HTML>	1 <!DOCTYPE HTML>

2	2

3 <!--	3 <!--

4 about:version template page	4 about:version template page

5 -->	5 -->

6	6

7 <html id="t" i18n-values="dir:textdirection;">	7 <html id="t" i18n-values="dir:textdirection;">

8 <head>	8 <head>

9 <title i18n-content="title"></title>	9 <title i18n-content="title"></title>

10 <if expr="pp_ifdef('android')">	10 <if expr="pp_ifdef('android')">

11 <meta name="viewport" content="width=device-width"/>	11 <meta name="viewport" content="width=device-width"/>

12 </if>	12 </if>

13 <link rel="stylesheet" href="shared/css/about_version.css">	13 <link rel="stylesheet" href="shared/css/about_version.css">

14 <if expr="pp_ifdef('android')">	14 <if expr="pp_ifdef('android')">

15 <link rel="stylesheet" href="about_version_android.css">	15 <link rel="stylesheet" href="about_version_android.css">

16 </if>	16 </if>

17 <script src="chrome://version/version.js"></script>	17 <script src="chrome://version/version.js"></script>

18 <script src="chrome://version/strings.js"></script>	18 <script src="chrome://version/strings.js"></script>

19 </head>	19 </head>

20	20

21 <body>	21 <body>

22 <div id="outer">	22 <div id="outer">

23 <div id="logo">	23 <div id="logo">

24 <!-- TODO: Revert back to src= once http://crbug.com/135179 is fixed -->	24 <if expr="pp_ifdef('android')">

25 <img id="logo-img">	25 <!-- Android does not support themes. -->

	26 <img src="../../app/theme/default_100_percent/%DISTRIBUTION%/product_log o.png">
	flackr 2012/07/27 18:03:45 I'm not sure this is necessary (moved from about_v I'm not sure this is necessary (moved from about_version_android.css), it may have been because of the error that I fixed in patchset 3. Ted C 2012/07/27 18:18:45 Sadly it is, android excludes all the theme source Show quoted text On 2012/07/27 18:03:45, flackr wrote: > I'm not sure this is necessary (moved from about_version_android.css), it may > have been because of the error that I fixed in patchset 3. Sadly it is, android excludes all the theme source in chrome_browser.gypi:4839 or there abouts. Dan Beam 2012/07/27 18:20:59 Is it possible to use ENABLE_THEMES instead of and Show quoted text On 2012/07/27 18:18:45, Ted C wrote: > On 2012/07/27 18:03:45, flackr wrote: > > I'm not sure this is necessary (moved from about_version_android.css), it may > > have been because of the error that I fixed in patchset 3. > > Sadly it is, android excludes all the theme source in chrome_browser.gypi:4839 > or there abouts. Is it possible to use ENABLE_THEMES instead of android here as well, by chance? flackr 2012/07/27 18:24:24 I believe grit only knows what we pass it in grit_ Show quoted text On 2012/07/27 18:20:59, Dan Beam wrote: > On 2012/07/27 18:18:45, Ted C wrote: > > On 2012/07/27 18:03:45, flackr wrote: > > > I'm not sure this is necessary (moved from about_version_android.css), it > may > > > have been because of the error that I fixed in patchset 3. > > > > Sadly it is, android excludes all the theme source in chrome_browser.gypi:4839 > > or there abouts. > > Is it possible to use ENABLE_THEMES instead of android here as well, by chance? I believe grit only knows what we pass it in grit_defines from build/common.gypi: http://code.google.com/p/chromium/source/search?q=grit_defines.android&origq... but I can verify. flackr* 2012/07/27 18:26:28 In fact I'll just pass enable_themes to grit as we Show quoted text On 2012/07/27 18:24:24, flackr wrote: > On 2012/07/27 18:20:59, Dan Beam wrote: > > On 2012/07/27 18:18:45, Ted C wrote: > > > On 2012/07/27 18:03:45, flackr wrote: > > > > I'm not sure this is necessary (moved from about_version_android.css), it > > may > > > > have been because of the error that I fixed in patchset 3. > > > > > > Sadly it is, android excludes all the theme source in > chrome_browser.gypi:4839 > > > or there abouts. > > > > Is it possible to use ENABLE_THEMES instead of android here as well, by > chance? > > I believe grit only knows what we pass it in grit_defines from > build/common.gypi: > http://code.google.com/p/chromium/source/search?q=grit_defines.*android&origq... > but I can verify. In fact I'll just pass enable_themes to grit as well so we can rely on this instead of checking for android.
	27 </if>

	28 <if expr="not pp_ifdef('android')">

	29 <img src="chrome://theme/IDR_PRODUCT_LOGO">

	30 </if>

26 <div id="company" i18n-content="company"></div>	31 <div id="company" i18n-content="company"></div>

27 <div id="copyright" i18n-content="copyright"></div>	32 <div id="copyright" i18n-content="copyright"></div>

28 </div>	33 </div>

29 <table id="inner" cellpadding="0" cellspacing="0" border="0">	34 <table id="inner" cellpadding="0" cellspacing="0" border="0">

30 <tr><td class="label" valign="top" id="name" i18n-content="name"></td>	35 <tr><td class="label" valign="top" id="name" i18n-content="name"></td>

31 <td class="version" id="version"><span i18n-content="version"></span> (<span i18n-content="official"></span> <span i18n-content="cl"></span>) <span i1 8n-content="version_modifier"></span></td>	36 <td class="version" id="version"><span i18n-content="version"></span> (<span i18n-content="official"></span> <span i18n-content="cl"></span>) <span i1 8n-content="version_modifier"></span></td>

32 </tr>	37 </tr>

33 <if expr="not pp_ifdef('chromeos')">	38 <if expr="not pp_ifdef('chromeos')">

34 <tr><td class="label" valign="top" i18n-content="os_name"></td>	39 <tr><td class="label" valign="top" i18n-content="os_name"></td>

35 <td class="version" id="os_type"><span i18n-content="os_type"></span> <span i18n-content="os_version"></span></td>	40 <td class="version" id="os_type"><span i18n-content="os_type"></span> <span i18n-content="os_version"></span></td>

(...skipping 27 matching lines...) Expand all Loading...
63 <td class="version" id="profile_path" i18n-content="profile_path"></ td>	68 <td class="version" id="profile_path" i18n-content="profile_path"></ td>

64 </tr>	69 </tr>

65 </table>	70 </table>

66 </div>	71 </div>

67 <script src="chrome://resources/js/i18n_template.js"></script>	72 <script src="chrome://resources/js/i18n_template.js"></script>

68 <script src="chrome://resources/js/i18n_process.js"></script>	73 <script src="chrome://resources/js/i18n_process.js"></script>

69 <script src="chrome://resources/js/jstemplate_compiled.js"></script>	74 <script src="chrome://resources/js/jstemplate_compiled.js"></script>

70 </body>	75 </body>

71	76

72 </html>	77 </html>

OLD	NEW

« no previous file with comments | « no previous file | chrome/browser/resources/about_version_android.css » ('j') | chrome/browser/ui/webui/about_ui.cc » ('J')