Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(959)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: ui/file_manager/gallery/gallery.html

Issue 1142303007: Gallery: Replace buttons in top toolbar with paper-button and new icons. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix integration tests. Created 5 years, 6 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
« no previous file with comments | « ui/file_manager/gallery/css/gallery.css ('k') | ui/file_manager/gallery/images/100/delete.png » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <!-- 1 <!--
2 -- Copyright 2014 The Chromium Authors. All rights reserved. 2 -- Copyright 2014 The Chromium Authors. All rights reserved.
3 -- Use of this source code is governed by a BSD-style license that can be 3 -- Use of this source code is governed by a BSD-style license that can be
4 -- found in the LICENSE file. 4 -- found in the LICENSE file.
5 --> 5 -->
6 <html> 6 <html>
7 <head> 7 <head>
8 <link rel="stylesheet" href="chrome://resources/css/text_defaults.css"> 8 <link rel="stylesheet" href="chrome://resources/css/text_defaults.css">
9 <link rel="stylesheet" href="../file_manager/foreground/css/list.css"> 9 <link rel="stylesheet" href="../file_manager/foreground/css/list.css">
10 <link rel="stylesheet" href="../file_manager/foreground/css/common.css"> 10 <link rel="stylesheet" href="../file_manager/foreground/css/common.css">
11 <link rel="stylesheet" href="../file_manager/foreground/css/file_types.css"> 11 <link rel="stylesheet" href="../file_manager/foreground/css/file_types.css">
12 <link rel="stylesheet" href="../file_manager/foreground/css/share_dialog.css"> 12 <link rel="stylesheet" href="../file_manager/foreground/css/share_dialog.css">
13 <link rel="stylesheet" href="css/gallery.css"> 13 <link rel="stylesheet" href="css/gallery.css">
14 14
15 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-bu tton.html">
16
15 <!-- Don't load gallery_scripts.js when flattening is disabled --> 17 <!-- Don't load gallery_scripts.js when flattening is disabled -->
16 <if expr="False"><!-- </if> 18 <if expr="False"><!-- </if>
17 <script src="js/gallery_scripts.js"></script> 19 <script src="js/gallery_scripts.js"></script>
18 <if expr="False"> --></if> 20 <if expr="False"> --></if>
19 21
20 <if expr="False"> 22 <if expr="False">
21 <!-- This section is used when the file manager is loaded with 23 <!-- This section is used when the file manager is loaded with
22 'filemgr-ext-path' command-line flag. --> 24 'filemgr-ext-path' command-line flag. -->
23 <!-- Keep the list in sync with gallery_scripts.js. --> 25 <!-- Keep the list in sync with gallery_scripts.js. -->
24 <script src="../file_manager/common/js/metrics_base.js"></script> 26 <script src="../file_manager/common/js/metrics_base.js"></script>
(...skipping 13 matching lines...) Expand all
38 <script src="chrome://resources/js/cr/ui/touch_handler.js"></script> 40 <script src="chrome://resources/js/cr/ui/touch_handler.js"></script>
39 <script src="chrome://resources/js/cr/ui/array_data_model.js"></script> 41 <script src="chrome://resources/js/cr/ui/array_data_model.js"></script>
40 <script src="chrome://resources/js/cr/ui/dialogs.js"></script> 42 <script src="chrome://resources/js/cr/ui/dialogs.js"></script>
41 <script src="chrome://resources/js/cr/ui/list_item.js"></script> 43 <script src="chrome://resources/js/cr/ui/list_item.js"></script>
42 <script src="chrome://resources/js/cr/ui/list_selection_model.js"></script> 44 <script src="chrome://resources/js/cr/ui/list_selection_model.js"></script>
43 <script src="chrome://resources/js/cr/ui/list_single_selection_model.js"></s cript> 45 <script src="chrome://resources/js/cr/ui/list_single_selection_model.js"></s cript>
44 <script src="chrome://resources/js/cr/ui/list_selection_controller.js"></scr ipt> 46 <script src="chrome://resources/js/cr/ui/list_selection_controller.js"></scr ipt>
45 <script src="chrome://resources/js/cr/ui/list.js"></script> 47 <script src="chrome://resources/js/cr/ui/list.js"></script>
46 <script src="chrome://resources/js/cr/ui/grid.js"></script> 48 <script src="chrome://resources/js/cr/ui/grid.js"></script>
47 49
48 <!-- Base classes. -> 50 <!-- Base classes. -->
49 <script src="../file_manager/foreground/js/metadata/metadata_cache_set.js">< /script> 51 <script src="../file_manager/foreground/js/metadata/metadata_cache_set.js">< /script>
50 <script src="../file_manager/foreground/js/metadata/new_metadata_provider.js "></script> 52 <script src="../file_manager/foreground/js/metadata/new_metadata_provider.js "></script>
51 53
52 <script src="../file_manager/common/js/async_util.js"></script> 54 <script src="../file_manager/common/js/async_util.js"></script>
53 <script src="../file_manager/common/js/file_type.js"></script> 55 <script src="../file_manager/common/js/file_type.js"></script>
54 <script src="../file_manager/common/js/volume_manager_common.js"></script> 56 <script src="../file_manager/common/js/volume_manager_common.js"></script>
55 57
56 <script src="../file_manager/foreground/js/metadata/content_metadata_provide r.js"></script> 58 <script src="../file_manager/foreground/js/metadata/content_metadata_provide r.js"></script>
57 <script src="../file_manager/foreground/js/metadata/exif_constants.js"></scr ipt> 59 <script src="../file_manager/foreground/js/metadata/exif_constants.js"></scr ipt>
58 <script src="../file_manager/foreground/js/metadata/external_metadata_provid er.js"></script> 60 <script src="../file_manager/foreground/js/metadata/external_metadata_provid er.js"></script>
(...skipping 28 matching lines...) Expand all
87 <script src="js/gallery_data_model.js"></script> 89 <script src="js/gallery_data_model.js"></script>
88 <script src="js/gallery_item.js"></script> 90 <script src="js/gallery_item.js"></script>
89 <script src="js/mosaic_mode.js"></script> 91 <script src="js/mosaic_mode.js"></script>
90 <script src="js/ribbon.js"></script> 92 <script src="js/ribbon.js"></script>
91 <script src="js/slide_mode.js"></script> 93 <script src="js/slide_mode.js"></script>
92 </if> 94 </if>
93 </head> 95 </head>
94 <body> 96 <body>
95 <div class="gallery"> 97 <div class="gallery">
96 <div id="content" class="content"></div> 98 <div id="content" class="content"></div>
97 <div id="header" class="header tool dimmable"></div>
98 <div id="top-toolbar" class="toolbar top tool dimmable"> 99 <div id="top-toolbar" class="toolbar top tool dimmable">
99 <div class="filename-spacer"></div> 100 <div class="filename-spacer"></div>
100 <div class="button-spacer"> 101 <div class="button-spacer">
101 <button class="button mode"></button> 102 <paper-button class="button edit" i18n-values="title:GALLERY_EDIT" disab led></paper-button>
102 <button class="button slideshow"></button> 103 <paper-button class="button print" i18n-values="title:GALLERY_PRINT" dis abled></paper-button>
103 <button class="button edit"></button> 104 <paper-button class="button delete" i18n-values="title:GALLERY_DELETE">< /paper-button>
104 <button class="button print"></button> 105 <paper-button class="button slide-mode" i18n-values="title:GALLERY_SLIDE "></paper-button>
105 <button class="delete"></button> 106 <paper-button class="button mosaic-mode" i18n-values="title:GALLERY_MOSA IC"></paper-button>
106 <button class="share"></button> 107 <paper-button class="button slideshow" i18n-values="title:GALLERY_SLIDES HOW"></paper-button>
108 <paper-button class="button share" i18n-values="title:GALLERY_SHARE"></p aper-button>
107 </div> 109 </div>
108 </div> 110 </div>
109 <div id="bottom-toolbar" class="toolbar bottom tool dimmable"> 111 <div id="bottom-toolbar" class="toolbar bottom tool dimmable">
110 <div class="slide-mode-toolbar"> 112 <div class="slide-mode-toolbar">
111 <div class="ribbon-spacer"></div> 113 <div class="ribbon-spacer"></div>
112 </div> 114 </div>
113 115
114 <div class="edit-mode-toolbar"> 116 <div class="edit-mode-toolbar">
115 <div class="options"> 117 <div class="options">
116 <!-- TODO(yawano): Replace overwrite original checkbox with undo toast . --> 118 <!-- TODO(yawano): Replace overwrite original checkbox with undo toast . -->
117 <div class="overwrite-original"> 119 <div class="overwrite-original">
118 <input id="overwrite-checkbox" type="checkbox"></input> 120 <input id="overwrite-checkbox" type="checkbox"></input>
119 <div class="label" for="overwrite-checkbox" i18n-content="GALLERY_OV ERWRITE_ORIGINAL"></div> 121 <div class="label" for="overwrite-checkbox" i18n-content="GALLERY_OV ERWRITE_ORIGINAL"></div>
120 </div> 122 </div>
121 <div class="saved" i18n-content="GALLERY_SAVED"></div> 123 <div class="saved" i18n-content="GALLERY_SAVED"></div>
122 </div> 124 </div>
123 <div class="edit-bar-spacer"></div> 125 <div class="edit-bar-spacer"></div>
124 </div> 126 </div>
125 </div> 127 </div>
126 <div class="prompt-wrapper" pos="center"> 128 <div class="prompt-wrapper" pos="center">
127 <div class="error-banner"></div> 129 <div class="error-banner"></div>
128 </div> 130 </div>
129 </div> 131 </div>
130 </body> 132 </body>
131 </html> 133 </html>
OLDNEW
« no previous file with comments | « ui/file_manager/gallery/css/gallery.css ('k') | ui/file_manager/gallery/images/100/delete.png » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698