chrome/browser/resources/chromeos/wallpaper_manager/main.html - Issue 10453032: Add wallpaper experimental api framework and add a simple category list.

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

Issue 10453032: Add wallpaper experimental api framework and add a simple category list. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 7 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

« chrome/browser/resources/chromeos/wallpaper_manager/js/main_scripts.js ('K') | « chrome/browser/resources/chromeos/wallpaper_manager/js/wallpaper_manager.js ('k') | chrome/browser/resources/chromeos/wallpaper_manager/manifest.json » ('j') | chrome/chrome_browser.gypi » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

3 <!--	3 <!--

4 ------	4 ------

5 Copyright (c) 2012 The Chromium Authors. All rights reserved.	5 Copyright (c) 2012 The Chromium Authors. All rights reserved.

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

7 found in the LICENSE file.	7 found in the LICENSE file.

8	8

9 -->	9 -->

10 <head>	10 <head>

11 <title>Placeholder for Wallpaper Manager Main page</title>	11 <title>Placeholder for Wallpaper Manager Main page</title>

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

	13 <script src="js/main_scripts.js"></script>

	14 <if expr="0">

	15 <!-- This file has not been flattened, load individual scripts.
	flackr 2012/05/26 14:16:45 What do you mean? Are you using the <if> expressio What do you mean? Are you using the <if> expression to prevent flattening? bshe 2012/05/29 16:07:11 Yes. These unflattened files will be used for acce Yes. These unflattened files will be used for accessing wallpaper manager directly from local file system. It's primarily for development purpose. So when access from the local file, these js files are not flattened into one single and probably large js file. It is the same technique that file manager used. On 2012/05/26 14:16:45, flackr wrote: Show quoted text > What do you mean? Are you using the <if> expression to prevent flattening? flackr 2012/05/31 18:41:55 I'm just unclear as to why you can't simply list a I'm just unclear as to why you can't simply list all of the scripts here and do away with main_scripts.js. It seems like that would work just as well and not require any special code like this. On 2012/05/29 16:07:11, bshe wrote: Show quoted text > Yes. These unflattened files will be used for accessing wallpaper manager > directly from local file system. It's primarily for development purpose. So when > access from the local file, these js files are not flattened into one single and > probably large js file. It is the same technique that file manager used. > > On 2012/05/26 14:16:45, flackr wrote: > > What do you mean? Are you using the <if> expression to prevent flattening? > bshe 2012/06/19 14:43:29 I guess the problem was the new added Content Secu I guess the problem was the new added Content Security Policy. It disallowed inline script. The flatter will inline the javascript if we directly list them all here. The related CL for file manager is http://codereview.chromium.org/10068007 On 2012/05/31 18:41:55, flackr wrote: Show quoted text > I'm just unclear as to why you can't simply list all of the scripts here and do > away with main_scripts.js. It seems like that would work just as well and not > require any special code like this. > > On 2012/05/29 16:07:11, bshe wrote: > > Yes. These unflattened files will be used for accessing wallpaper manager > > directly from local file system. It's primarily for development purpose. So > when > > access from the local file, these js files are not flattened into one single > and > > probably large js file. It is the same technique that file manager used. > > > > On 2012/05/26 14:16:45, flackr wrote: > > > What do you mean? Are you using the <if> expression to prevent flattening? > >
	16 Keep the list in sync with js/main_scripts.js. -->

	17 <script src="../../shared/js/local_strings.js"></script>

	18 <script src="js/wallpaper_manager.js"></script>

	19 <script src="js/main.js"></script>

	20 </if>

12 </head>	21 </head>

13 <body>	22 <body>

14 <h1>Wallpaper Manager</h1>	23 <div class="dialog-container">

15 <p>Coming soon.</p>	24 <div class="dialog-sidebar">

	25 <ul id="categories-list"></ul>

	26 </div>

	27 <div class="wallpaper-grid-container">

	28 </div>

	29 </div>

16 </body>	30 </body>

17 </html>	31 </html>

OLD	NEW