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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 22451003: Enable Quickoffice Editor by default. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 7 years, 4 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 | « chrome/browser/about_flags.cc ('k') | chrome/browser/extensions/component_loader.cc » ('j') | no next file with comments »
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 317 matching lines...) Expand 10 before | Expand all | Expand 10 after
328 </if> 328 </if>
329 <if expr="pp_ifdef('chromeos')"> 329 <if expr="pp_ifdef('chromeos')">
330 <include name="IDR_NETWORK_CONFIGURATION_MANIFEST" file="resources\chrom eos\network_configuration\manifest.json" type="BINDATA" /> 330 <include name="IDR_NETWORK_CONFIGURATION_MANIFEST" file="resources\chrom eos\network_configuration\manifest.json" type="BINDATA" />
331 </if> 331 </if>
332 <if expr="(is_linux and pp_ifdef('toolkit_views')) or pp_ifdef('use_ash')" > 332 <if expr="(is_linux and pp_ifdef('toolkit_views')) or pp_ifdef('use_ash')" >
333 <include name="IDR_HTTP_AUTH_HTML" file="resources\http_auth.html" flatt enhtml="true" type="BINDATA" /> 333 <include name="IDR_HTTP_AUTH_HTML" file="resources\http_auth.html" flatt enhtml="true" type="BINDATA" />
334 <include name="IDR_TAB_MODAL_CONFIRM_DIALOG_HTML" file="resources\tab_mo dal_confirm_dialog.html" flattenhtml="true" type="BINDATA" /> 334 <include name="IDR_TAB_MODAL_CONFIRM_DIALOG_HTML" file="resources\tab_mo dal_confirm_dialog.html" flattenhtml="true" type="BINDATA" />
335 </if> 335 </if>
336 <if expr="pp_ifdef('chromeos') and pp_ifdef('_google_chrome')"> 336 <if expr="pp_ifdef('chromeos') and pp_ifdef('_google_chrome')">
337 <include name="IDR_HELP_MANIFEST" file="resources\help_app\manifest.json " type="BINDATA" /> 337 <include name="IDR_HELP_MANIFEST" file="resources\help_app\manifest.json " type="BINDATA" />
338 <include name="IDR_QUICK_OFFICE_MANIFEST" file="resources\quick_office\m anifest.json" type="BINDATA" /> 338 <include name="IDR_QUICKOFFICE_VIEWING_MANIFEST" file="resources\quick_o ffice\manifest_viewing.json" type="BINDATA" />
339 <include name="IDR_QUICKOFFICE_EDITOR_MANIFEST" 339 <include name="IDR_QUICKOFFICE_EDITOR_MANIFEST" file="resources\quick_of fice\manifest_editor.json" type="BINDATA" />
340 file="resources\quick_office\manifest_experimental.json" type="BINDATA" />
341 </if> 340 </if>
342 <if expr="pp_ifdef('chromeos')"> 341 <if expr="pp_ifdef('chromeos')">
343 <include name="IDR_SALSA_CSS" file="resources\chromeos\salsa.css" type=" BINDATA" /> 342 <include name="IDR_SALSA_CSS" file="resources\chromeos\salsa.css" type=" BINDATA" />
344 <include name="IDR_SALSA_HTML" file="resources\chromeos\salsa.html" type ="BINDATA" /> 343 <include name="IDR_SALSA_HTML" file="resources\chromeos\salsa.html" type ="BINDATA" />
345 <include name="IDR_SALSA_JS" file="resources\chromeos\salsa.js" type="BI NDATA" /> 344 <include name="IDR_SALSA_JS" file="resources\chromeos\salsa.js" type="BI NDATA" />
346 </if> 345 </if>
347 <if expr="pp_ifdef('use_ash')"> 346 <if expr="pp_ifdef('use_ash')">
348 <include name="IDR_GESTURE_CONFIG_CSS" file="resources\gesture_config.cs s" type="BINDATA" /> 347 <include name="IDR_GESTURE_CONFIG_CSS" file="resources\gesture_config.cs s" type="BINDATA" />
349 <include name="IDR_GESTURE_CONFIG_HTML" file="resources\gesture_config.h tml" type="BINDATA" /> 348 <include name="IDR_GESTURE_CONFIG_HTML" file="resources\gesture_config.h tml" type="BINDATA" />
350 <include name="IDR_GESTURE_CONFIG_JS" file="resources\gesture_config.js" type="BINDATA" /> 349 <include name="IDR_GESTURE_CONFIG_JS" file="resources\gesture_config.js" type="BINDATA" />
(...skipping 12 matching lines...) Expand all
363 <include name="IDR_PROFILE_SIGNIN_CONFIRMATION_CSS" file="resources\profil e_signin_confirmation.css" type="BINDATA" /> 362 <include name="IDR_PROFILE_SIGNIN_CONFIRMATION_CSS" file="resources\profil e_signin_confirmation.css" type="BINDATA" />
364 <include name="IDR_RECENTLY_CLOSED_WINDOW" file="resources\ntp4\images\clo sed_window.png" type="BINDATA" /> 363 <include name="IDR_RECENTLY_CLOSED_WINDOW" file="resources\ntp4\images\clo sed_window.png" type="BINDATA" />
365 <if expr="not is_android"> 364 <if expr="not is_android">
366 <include name="IDR_IDENTITY_INTERNALS_HTML" file="resources\identity_int ernals.html" type="BINDATA" /> 365 <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" /> 366 <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" /> 367 <include name="IDR_IDENTITY_INTERNALS_JS" file="resources\identity_inter nals.js" type="BINDATA" />
369 </if> 368 </if>
370 </includes> 369 </includes>
371 </release> 370 </release>
372 </grit> 371 </grit>
OLDNEW
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/extensions/component_loader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698