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

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

Issue 13963004: Extract common OOBE controller code from oobe.js/login.js. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: small fixes Created 7 years, 8 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
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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 <if expr="not pp_ifdef('android')"> 44 <if expr="not pp_ifdef('android')">
45 <structure name="IDR_NEW_TAB_4_HTML" file="resources\ntp4\new_tab.html" flattenhtml="true" type="chrome_html" /> 45 <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" /> 46 <structure name="IDR_NEW_TAB_4_THEME_CSS" file="resources\ntp4\new_tab_t heme.css" flattenhtml="true" type="chrome_html" />
47 </if> 47 </if>
48 <if expr="pp_ifdef('android')"> 48 <if expr="pp_ifdef('android')">
49 <structure name="IDR_NEW_TAB_ANDROID_HTML" file="resources\ntp_android\n ew_tab.html" flattenhtml="true" type="chrome_html" /> 49 <structure name="IDR_NEW_TAB_ANDROID_HTML" file="resources\ntp_android\n ew_tab.html" flattenhtml="true" type="chrome_html" />
50 </if> 50 </if>
51 <if expr="pp_ifdef('chromeos')"> 51 <if expr="pp_ifdef('chromeos')">
52 <structure name="IDR_OOBE_HTML" file="resources\chromeos\login\oobe.html " flattenhtml="true" type="chrome_html" /> 52 <structure name="IDR_OOBE_HTML" file="resources\chromeos\login\oobe.html " flattenhtml="true" type="chrome_html" />
53 <structure name="IDR_OOBE_JS" file="resources\chromeos\login\oobe.js" fl attenhtml="true" type="chrome_html" /> 53 <structure name="IDR_OOBE_JS" file="resources\chromeos\login\oobe.js" fl attenhtml="true" type="chrome_html" />
54 <structure name="IDR_OOBE_COMMON_JS" file="resources\chromeos\login\oobe _common.js" flattenhtml="true" type="chrome_html" />
dzhioev (left Google) 2013/04/16 10:47:48 Do we need this declaration here? I thought prepro
dconnelly 2013/04/16 11:11:22 Cool. I didn't know it did that, but it makes sens
54 </if> 55 </if>
55 <structure name="IDR_READER_OUT_OF_DATE_HTML" file="resources\reader_out_o f_date.html" flattenhtml="true" type="chrome_html" /> 56 <structure name="IDR_READER_OUT_OF_DATE_HTML" file="resources\reader_out_o f_date.html" flattenhtml="true" type="chrome_html" />
56 <structure name="IDR_SSL_ROAD_BLOCK_HTML" file="resources\ssl_roadblock.ht ml" flattenhtml="true" type="chrome_html" /> 57 <structure name="IDR_SSL_ROAD_BLOCK_HTML" file="resources\ssl_roadblock.ht ml" flattenhtml="true" type="chrome_html" />
57 <structure name="IDR_SAFE_BROWSING_MALWARE_BLOCK_V2" file="resources\safe_ browsing\malware_block_v2.html" flattenhtml="true" type="chrome_html" /> 58 <structure name="IDR_SAFE_BROWSING_MALWARE_BLOCK_V2" file="resources\safe_ browsing\malware_block_v2.html" flattenhtml="true" type="chrome_html" />
58 <structure name="IDR_MANAGED_USER_PASSPHRASE_DIALOG_HTML" file="resources\ managed_user_passphrase_dialog.html" flattenhtml="true" type="chrome_html" /> 59 <structure name="IDR_MANAGED_USER_PASSPHRASE_DIALOG_HTML" file="resources\ managed_user_passphrase_dialog.html" flattenhtml="true" type="chrome_html" />
59 </structures> 60 </structures>
60 <includes> 61 <includes>
61 <if expr="is_win"> 62 <if expr="is_win">
62 <include name="IDR_ABOUT_CONFLICTS_HTML" file="resources\about_conflicts .html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 63 <include name="IDR_ABOUT_CONFLICTS_HTML" file="resources\about_conflicts .html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
63 <include name="IDR_ABOUT_CONFLICTS_JS" file="resources\about_conflicts.j s" type="BINDATA" /> 64 <include name="IDR_ABOUT_CONFLICTS_JS" file="resources\about_conflicts.j s" type="BINDATA" />
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
330 <include name="IDR_SET_AS_DEFAULT_BROWSER_HTML" file="resources\set_as_d efault_browser.html" flattenhtml="true" allowexternalscript="true" type="BINDATA " /> 331 <include name="IDR_SET_AS_DEFAULT_BROWSER_HTML" file="resources\set_as_d efault_browser.html" flattenhtml="true" allowexternalscript="true" type="BINDATA " />
331 </if> 332 </if>
332 <include name="IDR_MANAGED_MODE_BLOCK_INTERSTITIAL_HTML" file="resources\m anaged_mode_block_interstitial.html" flattenhtml="true" type="BINDATA" /> 333 <include name="IDR_MANAGED_MODE_BLOCK_INTERSTITIAL_HTML" file="resources\m anaged_mode_block_interstitial.html" flattenhtml="true" type="BINDATA" />
333 <include name="IDR_MANAGED_USER_PASSPHRASE_DIALOG_JS" file="resources\mana ged_user_passphrase_dialog.js" type="BINDATA" /> 334 <include name="IDR_MANAGED_USER_PASSPHRASE_DIALOG_JS" file="resources\mana ged_user_passphrase_dialog.js" type="BINDATA" />
334 <include name="IDR_PROFILE_SIGNIN_CONFIRMATION_HTML" file="resources\profi le_signin_confirmation.html" type="BINDATA" /> 335 <include name="IDR_PROFILE_SIGNIN_CONFIRMATION_HTML" file="resources\profi le_signin_confirmation.html" type="BINDATA" />
335 <include name="IDR_PROFILE_SIGNIN_CONFIRMATION_JS" file="resources\profile _signin_confirmation.js" type="BINDATA" /> 336 <include name="IDR_PROFILE_SIGNIN_CONFIRMATION_JS" file="resources\profile _signin_confirmation.js" type="BINDATA" />
336 <include name="IDR_PROFILE_SIGNIN_CONFIRMATION_CSS" file="resources\profil e_signin_confirmation.css" type="BINDATA" /> 337 <include name="IDR_PROFILE_SIGNIN_CONFIRMATION_CSS" file="resources\profil e_signin_confirmation.css" type="BINDATA" />
337 </includes> 338 </includes>
338 </release> 339 </release>
339 </grit> 340 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/chromeos/login/login.js » ('j') | chrome/browser/ui/webui/chromeos/login/oobe_ui.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698