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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/browser_resources.grd

Issue 17437004: Implemented new channel switcher UI. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed FakeUpdateEngineClient. Created 7 years, 5 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
« no previous file with comments | « no previous file | chrome/browser/resources/help/channel_change_page.css » ('j') | chrome/browser/ui/webui/help/help_handler.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <grit latest_public_release="0" current_release="1"> 2 <grit latest_public_release="0" current_release="1">
3 <outputs> 3 <outputs>
4 <output filename="grit/browser_resources.h" type="rc_header"> 4 <output filename="grit/browser_resources.h" type="rc_header">
5 <emit emit_type='prepend'></emit> 5 <emit emit_type='prepend'></emit>
6 </output> 6 </output>
7 <output filename="browser_resources.pak" type="data_package" /> 7 <output filename="browser_resources.pak" type="data_package" />
8 <output filename="browser_resources.rc" type="rc_all" /> 8 <output filename="browser_resources.rc" type="rc_all" />
9 </outputs> 9 </outputs>
10 <release seq="1"> 10 <release seq="1">
(...skipping 17 matching lines...) Expand all
28 <structure name="IDR_DEMO_USER_LOGIN_HTML" file="resources\chromeos\logi n\demo_user_login.html" flattenhtml="true" type="chrome_html" /> 28 <structure name="IDR_DEMO_USER_LOGIN_HTML" file="resources\chromeos\logi n\demo_user_login.html" flattenhtml="true" type="chrome_html" />
29 <structure name="IDR_DEMO_USER_LOGIN_JS" file="resources\chromeos\login\ demo_user_login.js" flattenhtml="true" type="chrome_html" /> 29 <structure name="IDR_DEMO_USER_LOGIN_JS" file="resources\chromeos\login\ demo_user_login.js" flattenhtml="true" type="chrome_html" />
30 <structure name="IDR_APP_LAUNCH_SPLASH_HTML" file="resources\chromeos\ap p_launch\app_launch.html" flattenhtml="true" type="chrome_html" /> 30 <structure name="IDR_APP_LAUNCH_SPLASH_HTML" file="resources\chromeos\ap p_launch\app_launch.html" flattenhtml="true" type="chrome_html" />
31 <structure name="IDR_APP_LAUNCH_SPLASH_JS" file="resources\chromeos\app_ launch\app_launch.js" flattenhtml="true" type="chrome_html" /> 31 <structure name="IDR_APP_LAUNCH_SPLASH_JS" file="resources\chromeos\app_ launch\app_launch.js" flattenhtml="true" type="chrome_html" />
32 </if> 32 </if>
33 <structure name="IDR_DOWNLOADS_CSS" file="resources\downloads\downloads.cs s" flattenhtml="true" type="chrome_html" /> 33 <structure name="IDR_DOWNLOADS_CSS" file="resources\downloads\downloads.cs s" flattenhtml="true" type="chrome_html" />
34 <structure name="IDR_DOWNLOADS_HTML" file="resources\downloads\downloads.h tml" flattenhtml="true" allowexternalscript="true" type="chrome_html" /> 34 <structure name="IDR_DOWNLOADS_HTML" file="resources\downloads\downloads.h tml" flattenhtml="true" allowexternalscript="true" type="chrome_html" />
35 <structure name="IDR_EXTENSIONS_HTML" file="resources\extensions\extension s.html" flattenhtml="true" type="chrome_html" /> 35 <structure name="IDR_EXTENSIONS_HTML" file="resources\extensions\extension s.html" flattenhtml="true" type="chrome_html" />
36 <structure name="IDR_HELP_CSS" file="resources\help\help.css" flattenhtml= "true" type="chrome_html" /> 36 <structure name="IDR_HELP_CSS" file="resources\help\help.css" flattenhtml= "true" type="chrome_html" />
37 <structure name="IDR_HELP_HTML" file="resources\help\help.html" flattenhtm l="true" type="chrome_html" /> 37 <structure name="IDR_HELP_HTML" file="resources\help\help.html" flattenhtm l="true" type="chrome_html" />
38 <structure name="IDR_HELP_CHANNEL_CHANGE_PAGE_CSS" file="resources\help\ch annel_change_page.css" flattenhtml="true" type="chrome_html" />
39 <structure name="IDR_HELP_CHANNEL_CHANGE_PAGE_HTML" file="resources\help\c hannel_change_page.html" flattenhtml="true" type="chrome_html" />
38 <structure name="IDR_INCOGNITO_TAB_HTML" file="resources\incognito_tab.htm l" flattenhtml="true" type="chrome_html" /> 40 <structure name="IDR_INCOGNITO_TAB_HTML" file="resources\incognito_tab.htm l" flattenhtml="true" type="chrome_html" />
39 <if expr="pp_ifdef('chromeos')"> 41 <if expr="pp_ifdef('chromeos')">
40 <structure name="IDR_LOGIN_HTML" file="resources\chromeos\login\login.ht ml" flattenhtml="true" type="chrome_html" variables="OOBE=login" expand_variable s="true"/> 42 <structure name="IDR_LOGIN_HTML" file="resources\chromeos\login\login.ht ml" flattenhtml="true" type="chrome_html" variables="OOBE=login" expand_variable s="true"/>
41 <structure name="IDR_LOGIN_JS" file="resources\chromeos\login\login.js" flattenhtml="true" type="chrome_html" /> 43 <structure name="IDR_LOGIN_JS" file="resources\chromeos\login\login.js" flattenhtml="true" type="chrome_html" />
42 </if> 44 </if>
43 <structure name="IDR_NEW_INCOGNITO_TAB_THEME_CSS" file="resources\new_inco gnito_tab_theme.css" flattenhtml="true" type="chrome_html" /> 45 <structure name="IDR_NEW_INCOGNITO_TAB_THEME_CSS" file="resources\new_inco gnito_tab_theme.css" flattenhtml="true" type="chrome_html" />
44 <if expr="not is_android"> 46 <if expr="not is_android">
45 <structure name="IDR_NEW_TAB_4_HTML" file="resources\ntp4\new_tab.html" flattenhtml="true" type="chrome_html" /> 47 <structure name="IDR_NEW_TAB_4_HTML" file="resources\ntp4\new_tab.html" flattenhtml="true" type="chrome_html" />
46 <structure name="IDR_NEW_TAB_4_THEME_CSS" file="resources\ntp4\new_tab_t heme.css" flattenhtml="true" type="chrome_html" /> 48 <structure name="IDR_NEW_TAB_4_THEME_CSS" file="resources\ntp4\new_tab_t heme.css" flattenhtml="true" type="chrome_html" />
47 </if> 49 </if>
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 <if expr="not is_android"> 113 <if expr="not is_android">
112 <include name="IDR_EXTENSION_LIST_JS" file="resources\extensions\extensi on_list.js" flattenhtml="true" type="BINDATA" /> 114 <include name="IDR_EXTENSION_LIST_JS" file="resources\extensions\extensi on_list.js" flattenhtml="true" type="BINDATA" />
113 <include name="IDR_EXTENSION_INFO_CSS" file="resources\extensions\extens ion_info.css" flattenhtml="true" type="BINDATA" /> 115 <include name="IDR_EXTENSION_INFO_CSS" file="resources\extensions\extens ion_info.css" flattenhtml="true" type="BINDATA" />
114 <include name="IDR_EXTENSION_INFO_HTML" file="resources\extensions\exten sion_info.html" flattenhtml="true" type="BINDATA" /> 116 <include name="IDR_EXTENSION_INFO_HTML" file="resources\extensions\exten sion_info.html" flattenhtml="true" type="BINDATA" />
115 <include name="IDR_EXTENSION_INFO_JS" file="resources\extensions\extensi on_info.js" flattenhtml="true" type="BINDATA" /> 117 <include name="IDR_EXTENSION_INFO_JS" file="resources\extensions\extensi on_info.js" flattenhtml="true" type="BINDATA" />
116 <include name="IDR_EXTENSIONS_JS" file="resources\extensions\extensions. js" flattenhtml="true" type="BINDATA" /> 118 <include name="IDR_EXTENSIONS_JS" file="resources\extensions\extensions. js" flattenhtml="true" type="BINDATA" />
117 </if> 119 </if>
118 <include name="IDR_FLAGS_HTML" file="resources\flags.html" flattenhtml="tr ue" type="BINDATA" /> 120 <include name="IDR_FLAGS_HTML" file="resources\flags.html" flattenhtml="tr ue" type="BINDATA" />
119 <include name="IDR_FLAGS_JS" file="resources\flags.js" type="BINDATA" /> 121 <include name="IDR_FLAGS_JS" file="resources\flags.js" type="BINDATA" />
120 <include name="IDR_HELP_JS" file="resources\help\help.js" flattenhtml="tru e" type="BINDATA" /> 122 <include name="IDR_HELP_JS" file="resources\help\help.js" flattenhtml="tru e" type="BINDATA" />
123 <include name="IDR_CHANNEL_CHANGE_PAGE_JS" file="resources\help\channel_ch ange_page.js" flattenhtml="true" type="BINDATA" />
121 <include name="IDR_HISTORY_HTML" file="resources\history\history.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" /> 124 <include name="IDR_HISTORY_HTML" file="resources\history\history.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" />
122 <include name="IDR_HISTORY_JS" file="resources\history\history.js" flatten html="true" type="BINDATA" /> 125 <include name="IDR_HISTORY_JS" file="resources\history\history.js" flatten html="true" type="BINDATA" />
123 <include name="IDR_OTHER_DEVICES_JS" file="resources\history\other_devices .js" flattenhtml="true" type="BINDATA" /> 126 <include name="IDR_OTHER_DEVICES_JS" file="resources\history\other_devices .js" flattenhtml="true" type="BINDATA" />
124 <include name="IDR_IDENTITY_API_SCOPE_APPROVAL_MANIFEST" file="resources\i dentity_scope_approval_dialog\manifest.json" type="BINDATA" /> 127 <include name="IDR_IDENTITY_API_SCOPE_APPROVAL_MANIFEST" file="resources\i dentity_scope_approval_dialog\manifest.json" type="BINDATA" />
125 <include name="IDR_INLINE_LOGIN_HTML" file="resources\inline_login\inline_ login.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 128 <include name="IDR_INLINE_LOGIN_HTML" file="resources\inline_login\inline_ login.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
126 <include name="IDR_INLINE_LOGIN_CSS" file="resources\inline_login\inline_l ogin.css" flattenhtml="true" type="BINDATA" /> 129 <include name="IDR_INLINE_LOGIN_CSS" file="resources\inline_login\inline_l ogin.css" flattenhtml="true" type="BINDATA" />
127 <include name="IDR_INLINE_LOGIN_JS" file="resources\inline_login\inline_lo gin.js" flattenhtml="true" type="BINDATA" /> 130 <include name="IDR_INLINE_LOGIN_JS" file="resources\inline_login\inline_lo gin.js" flattenhtml="true" type="BINDATA" />
128 <include name="IDR_INSPECT_CSS" file="resources\inspect\inspect.css" flatt enhtml="true" type="BINDATA" /> 131 <include name="IDR_INSPECT_CSS" file="resources\inspect\inspect.css" flatt enhtml="true" type="BINDATA" />
129 <include name="IDR_INSPECT_HTML" file="resources\inspect\inspect.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" /> 132 <include name="IDR_INSPECT_HTML" file="resources\inspect\inspect.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" />
130 <include name="IDR_INSPECT_JS" file="resources\inspect\inspect.js" flatten html="true" type="BINDATA" /> 133 <include name="IDR_INSPECT_JS" file="resources\inspect\inspect.js" flatten html="true" type="BINDATA" />
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
351 354
352 <include name="IDR_RECENTLY_CLOSED_WINDOW" file="resources\ntp4\images\clo sed_window.png" type="BINDATA" /> 355 <include name="IDR_RECENTLY_CLOSED_WINDOW" file="resources\ntp4\images\clo sed_window.png" type="BINDATA" />
353 <if expr="not is_android"> 356 <if expr="not is_android">
354 <include name="IDR_IDENTITY_INTERNALS_HTML" file="resources\identity_int ernals.html" type="BINDATA" /> 357 <include name="IDR_IDENTITY_INTERNALS_HTML" file="resources\identity_int ernals.html" type="BINDATA" />
355 <include name="IDR_IDENTITY_INTERNALS_CSS" file="resources\identity_inte rnals.css" type="BINDATA" /> 358 <include name="IDR_IDENTITY_INTERNALS_CSS" file="resources\identity_inte rnals.css" type="BINDATA" />
356 <include name="IDR_IDENTITY_INTERNALS_JS" file="resources\identity_inter nals.js" type="BINDATA" /> 359 <include name="IDR_IDENTITY_INTERNALS_JS" file="resources\identity_inter nals.js" type="BINDATA" />
357 </if> 360 </if>
358 </includes> 361 </includes>
359 </release> 362 </release>
360 </grit> 363 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/help/channel_change_page.css » ('j') | chrome/browser/ui/webui/help/help_handler.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698