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

Unified 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 side-by-side diff with in-line comments

Download patch

« 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')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/chromeos/wallpaper_manager/main.html

diff --git a/chrome/browser/resources/chromeos/wallpaper_manager/main.html b/chrome/browser/resources/chromeos/wallpaper_manager/main.html

index 70852476855c2db674d8f8d302faea207d938c02..e45914476c7eeb9ed3c458f355e5845b9c7ffa81 100644

--- a/chrome/browser/resources/chromeos/wallpaper_manager/main.html

+++ b/chrome/browser/resources/chromeos/wallpaper_manager/main.html

@@ -9,9 +9,23 @@ found in the LICENSE file.

-->

<head>

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

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

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

+ <if expr="0">

+ <!-- 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

bshe 2012/05/29 16:07:11 Yes. These unflattened files will be used for acce

flackr 2012/05/31 18:41:55 I'm just unclear as to why you can't simply list a

bshe 2012/06/19 14:43:29 I guess the problem was the new added Content Secu

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

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

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

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

+ </if>

</head>

<body>

- <h1>Wallpaper Manager</h1>

- <p>Coming soon.</p>

+ <div class="dialog-container">

+ <div class="dialog-sidebar">

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

+ </div>

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

+ </div>

</body>

</html>