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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 16104008: First try at a user management screen for the desktop (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase and review comments 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
« chrome/app/theme/theme_resources.grd ('K') | « chrome/app/theme/theme_resources.grd ('k') | chrome/browser/profiles/avatar_menu_model.cc » ('j') | chrome/browser/profiles/profile_manager.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 338 matching lines...) Expand 10 before | Expand all | Expand 10 after
349 </if> 349 </if>
350 <if expr="pp_ifdef('use_ash')"> 350 <if expr="pp_ifdef('use_ash')">
351 <include name="IDR_GESTURE_CONFIG_CSS" file="resources\gesture_config.cs s" type="BINDATA" /> 351 <include name="IDR_GESTURE_CONFIG_CSS" file="resources\gesture_config.cs s" type="BINDATA" />
352 <include name="IDR_GESTURE_CONFIG_HTML" file="resources\gesture_config.h tml" type="BINDATA" /> 352 <include name="IDR_GESTURE_CONFIG_HTML" file="resources\gesture_config.h tml" type="BINDATA" />
353 <include name="IDR_GESTURE_CONFIG_JS" file="resources\gesture_config.js" type="BINDATA" /> 353 <include name="IDR_GESTURE_CONFIG_JS" file="resources\gesture_config.js" type="BINDATA" />
354 </if> 354 </if>
355 <if expr="is_win"> 355 <if expr="is_win">
356 <include name="IDR_SET_AS_DEFAULT_BROWSER_JS" file="resources\set_as_def ault_browser.js" flattenhtml="true" type="BINDATA" /> 356 <include name="IDR_SET_AS_DEFAULT_BROWSER_JS" file="resources\set_as_def ault_browser.js" flattenhtml="true" type="BINDATA" />
357 <include name="IDR_SET_AS_DEFAULT_BROWSER_HTML" file="resources\set_as_d efault_browser.html" flattenhtml="true" allowexternalscript="true" type="BINDATA " /> 357 <include name="IDR_SET_AS_DEFAULT_BROWSER_HTML" file="resources\set_as_d efault_browser.html" flattenhtml="true" allowexternalscript="true" type="BINDATA " />
358 </if> 358 </if>
359 <if expr="not is_android and not pp_ifdef('ios') and not pp_ifdef('chromeo s')">
360 <include name="IDR_USER_CHOOSER_JS" file="resources\user_chooser\user_ch ooser.js" flattenhtml="true" type="BINDATA" />
361 <include name="IDR_USER_CHOOSER_HTML" file="resources\user_chooser\user_ chooser.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
362 </if>
359 <include name="IDR_MANAGED_MODE_BLOCK_INTERSTITIAL_HTML" file="resources\m anaged_mode_block_interstitial.html" flattenhtml="true" type="BINDATA" /> 363 <include name="IDR_MANAGED_MODE_BLOCK_INTERSTITIAL_HTML" file="resources\m anaged_mode_block_interstitial.html" flattenhtml="true" type="BINDATA" />
360 <include name="IDR_PROFILE_SIGNIN_CONFIRMATION_HTML" file="resources\profi le_signin_confirmation.html" type="BINDATA" /> 364 <include name="IDR_PROFILE_SIGNIN_CONFIRMATION_HTML" file="resources\profi le_signin_confirmation.html" type="BINDATA" />
361 <include name="IDR_PROFILE_SIGNIN_CONFIRMATION_JS" file="resources\profile _signin_confirmation.js" type="BINDATA" /> 365 <include name="IDR_PROFILE_SIGNIN_CONFIRMATION_JS" file="resources\profile _signin_confirmation.js" type="BINDATA" />
362 <include name="IDR_PROFILE_SIGNIN_CONFIRMATION_CSS" file="resources\profil e_signin_confirmation.css" type="BINDATA" /> 366 <include name="IDR_PROFILE_SIGNIN_CONFIRMATION_CSS" file="resources\profil e_signin_confirmation.css" type="BINDATA" />
363
364 <include name="IDR_RECENTLY_CLOSED_WINDOW" file="resources\ntp4\images\clo sed_window.png" type="BINDATA" /> 367 <include name="IDR_RECENTLY_CLOSED_WINDOW" file="resources\ntp4\images\clo sed_window.png" type="BINDATA" />
365 <if expr="not is_android"> 368 <if expr="not is_android">
366 <include name="IDR_IDENTITY_INTERNALS_HTML" file="resources\identity_int ernals.html" type="BINDATA" /> 369 <include name="IDR_IDENTITY_INTERNALS_HTML" file="resources\identity_int ernals.html" type="BINDATA" />
367 <include name="IDR_IDENTITY_INTERNALS_CSS" file="resources\identity_inte rnals.css" type="BINDATA" /> 370 <include name="IDR_IDENTITY_INTERNALS_CSS" file="resources\identity_inte rnals.css" type="BINDATA" />
368 <include name="IDR_IDENTITY_INTERNALS_JS" file="resources\identity_inter nals.js" type="BINDATA" /> 371 <include name="IDR_IDENTITY_INTERNALS_JS" file="resources\identity_inter nals.js" type="BINDATA" />
369 </if> 372 </if>
370 </includes> 373 </includes>
371 </release> 374 </release>
372 </grit> 375 </grit>
OLDNEW
« chrome/app/theme/theme_resources.grd ('K') | « chrome/app/theme/theme_resources.grd ('k') | chrome/browser/profiles/avatar_menu_model.cc » ('j') | chrome/browser/profiles/profile_manager.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698