chrome/browser/resources/chromeos/wallpaper_manager/main.html - Issue 786023002: Remove hard-coded font families in WebUI.

Side by Side Diff: chrome/browser/resources/chromeos/wallpaper_manager/main.html

Issue 786023002: Remove hard-coded font families in WebUI. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: The First Version. Created 6 years 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

« chrome/browser/resources/chromeos/salsa.html ('K') | « chrome/browser/resources/chromeos/slow.html ('k') | chrome/browser/resources/components.html » ('j') | chrome/browser/resources/gaia_auth/main.html » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

2 <!--	2 <!--

3 ------	3 ------

4 Copyright (c) 2013 The Chromium Authors. All rights reserved.	4 Copyright (c) 2013 The Chromium Authors. All rights reserved.

5 Use of this source code is governed by a BSD-style license that can be	5 Use of this source code is governed by a BSD-style license that can be

6 found in the LICENSE file.	6 found in the LICENSE file.

7 -->	7 -->

8 <html i18n-values="dir:textdirection;">	8 <html i18n-values="dir:textdirection;">

9 <head>	9 <head>

10 <meta charset="utf-8">	10 <meta charset="utf-8">

11 <title>Wallpaper Picker</title>	11 <title>Wallpaper Picker</title>

	12 <link rel="stylesheet" href="chrome://resources/css/text_defaults.css">

12 <link rel="stylesheet" href="../../../../../ui/webui/resources/css/widgets.css ">	13 <link rel="stylesheet" href="../../../../../ui/webui/resources/css/widgets.css ">

13 <link rel="stylesheet" href="../../../../../ui/webui/resources/css/menu.css">< /link>	14 <link rel="stylesheet" href="../../../../../ui/webui/resources/css/menu.css">< /link>

14	15

15 <link rel="stylesheet" href="css/wallpaper_manager.css">	16 <link rel="stylesheet" href="css/wallpaper_manager.css">

16 <script src="js/main_scripts.js"></script>	17 <script src="js/main_scripts.js"></script>

17 <if expr="False">	18 <if expr="False">

18 <!-- This file has not been flattened, load individual scripts.	19 <!-- This file has not been flattened, load individual scripts.

19 Keep the list in sync with js/main_scripts.js. -->	20 Keep the list in sync with js/main_scripts.js. -->

20 <script src="../../../../../ui/webui/resources/js/cr.js"></script>	21 <script src="../../../../../ui/webui/resources/js/cr.js"></script>

21 <script src="../../../../../ui/webui/resources/js/event_tracker.js"></script >	22 <script src="../../../../../ui/webui/resources/js/event_tracker.js"></script >

(...skipping 20 matching lines...) Expand all Loading...
42 <script src="js/constants.js"></script>	43 <script src="js/constants.js"></script>

43 <script src="js/util.js"></script>	44 <script src="js/util.js"></script>

44 <script src="js/progress_manager.js"></script>	45 <script src="js/progress_manager.js"></script>

45 <script src="js/wallpaper_directories.js"></script>	46 <script src="js/wallpaper_directories.js"></script>

46 <script src="js/wallpaper_images_grid.js"></script>	47 <script src="js/wallpaper_images_grid.js"></script>

47 <script src="js/wallpaper_manager.js"></script>	48 <script src="js/wallpaper_manager.js"></script>

48 <script src="js/main.js"></script>	49 <script src="js/main.js"></script>

49 </if>	50 </if>

50 </head>	51 </head>

51 <body i18n-values=".style.fontFamily:webFontFamily;	52 <body i18n-values=".style.fontFamily:webFontFamily;

52 .style.fontSize:webFontSize">	53 .style.fontSize:webFontSize">
	Dan Beam 2014/12/10 19:49:24 is this page supposed to be intentionally differen is this page supposed to be intentionally different or is this just a typo? jungshik at Google 2014/12/10 20:14:14 They're using the same IDS_WEB_FONT_FAMILY/SIZE, b Show quoted text On 2014/12/10 19:49:24, Dan Beam wrote: > is this page supposed to be intentionally different or is this just a typo? They're using the same IDS_WEB_FONT_FAMILY/SIZE, but loading them differently. Anyway, this should go away as well. Moreover, we have to get rid of the code loading IDS_WEB_FONT_{FAMILY,SIZE} for this html as well as all other html files. Usually, it's done with SetFontAndTextDirection() and we don't need that function any more. So, we should remove that function. Needless to say, we have to fix all the call sites, too. xdai1 2014/12/11 02:59:22 Removed webFontFamily and webFontSize here. I'll m Show quoted text On 2014/12/10 20:14:14, Jungshik Shin wrote: > On 2014/12/10 19:49:24, Dan Beam wrote: > > is this page supposed to be intentionally different or is this just a typo? > > They're using the same IDS_WEB_FONT_FAMILY/SIZE, but loading them differently. > Anyway, this should go away as well. > > Moreover, we have to get rid of the code loading IDS_WEB_FONT_{FAMILY,SIZE} for > this html as well as all other html files. Usually, it's done with > SetFontAndTextDirection() and we don't need that function any more. > So, we should remove that function. Needless to say, we have to fix all the call > sites, too. Removed webFontFamily and webFontSize here. I'll modify SetFontAndTextDirection() function and get rid of SET_STRING(font/size) in next cl.
53 <commands>	54 <commands>

54 <command id="delete" i18n-values="label:deleteCommandLabel"	55 <command id="delete" i18n-values="label:deleteCommandLabel"

55 shortcut="U+007F"></command>	56 shortcut="U+007F"></command>

56 </commands>	57 </commands>

57	58

58 <menu id="wallpaper-context-menu" class="chrome-menu" visibleif="custom">	59 <menu id="wallpaper-context-menu" class="chrome-menu" visibleif="custom">

59 <menuitem command="#delete"></menuitem>	60 <menuitem command="#delete"></menuitem>

60 </menu>	61 </menu>

61	62

62 <div id="error-container" class="overlay-container" hidden>	63 <div id="error-container" class="overlay-container" hidden>

(...skipping 60 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
123 <div id="surprise-me" hidden>	124 <div id="surprise-me" hidden>

124 <div id="checkbox"></div>	125 <div id="checkbox"></div>

125 <span i18n-content="surpriseMeLabel"></span>	126 <span i18n-content="surpriseMeLabel"></span>

126 </div>	127 </div>

127 </div>	128 </div>

128 </div>	129 </div>

129 </div>	130 </div>

130 </div>	131 </div>

131 </body>	132 </body>

132 </html>	133 </html>

OLD	NEW