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

Side by Side Diff: chrome/app/chromium_strings.grd

Issue 1412453002: Remove enable-iframe-based-signin flag. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased Created 5 years, 1 month 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 <!-- This file contains definitions of strings that are distribution specific. 2 <!-- This file contains definitions of strings that are distribution specific.
3 If you update this file, be sure also to update google_chrome_strings.grd. --> 3 If you update this file, be sure also to update google_chrome_strings.grd. -->
4 4
5 <grit base_dir="." latest_public_release="0" current_release="1" 5 <grit base_dir="." latest_public_release="0" current_release="1"
6 source_lang_id="en" enc_check="möl"> 6 source_lang_id="en" enc_check="möl">
7 <outputs> 7 <outputs>
8 <output filename="grit/chromium_strings.h" type="rc_header"> 8 <output filename="grit/chromium_strings.h" type="rc_header">
9 <emit emit_type='prepend'></emit> 9 <emit emit_type='prepend'></emit>
10 </output> 10 </output>
(...skipping 533 matching lines...) Expand 10 before | Expand all | Expand 10 after
544 </if> 544 </if>
545 545
546 <!-- Autolaunch infobar --> 546 <!-- Autolaunch infobar -->
547 <if expr="is_win"> 547 <if expr="is_win">
548 <message name="IDS_AUTO_LAUNCH_INFOBAR_TEXT" desc="The text to show in t he infobar when Chromium was automatically launched on startup"> 548 <message name="IDS_AUTO_LAUNCH_INFOBAR_TEXT" desc="The text to show in t he infobar when Chromium was automatically launched on startup">
549 Chromium is configured to automatically launch when you start your com puter. 549 Chromium is configured to automatically launch when you start your com puter.
550 </message> 550 </message>
551 </if> 551 </if>
552 552
553 <!-- about:flags --> 553 <!-- about:flags -->
554 <message name="IDS_FLAGS_ENABLE_IFRAME_BASED_SIGNIN_NAME" desc="Title for the flag to enable iframe-based sign-in flows.">
555 Enables iframe-based Chromium sign-in flows. This flag overrides --enabl e-web-based-signin.
556 </message>
557 <message name="IDS_FLAGS_ENABLE_IFRAME_BASED_SIGNIN_DESCRIPTION" desc="Des cription for the flag to enable iframe-based sign-in flows">
558 When enabled, will use an iframe-based Chromium sign-in flow; otherwise uses a webview-based flow.
559 </message>
560 <message name="IDS_FLAGS_DEBUG_SHORTCUTS_DESCRIPTION" desc="Description of the 'Debugging keyboard shortcuts' lab."> 554 <message name="IDS_FLAGS_DEBUG_SHORTCUTS_DESCRIPTION" desc="Description of the 'Debugging keyboard shortcuts' lab.">
561 Enables additional keyboard shortcuts that are useful for debugging Chro mium. 555 Enables additional keyboard shortcuts that are useful for debugging Chro mium.
562 </message> 556 </message>
563 557
564 <!-- Obsolete System info bar --> 558 <!-- Obsolete System info bar -->
565 <message name="IDS_SYSTEM_OBSOLETE_MESSAGE" desc="Message shown when your OS is no longer supported. This message is followed by a 'Learn more' link."> 559 <message name="IDS_SYSTEM_OBSOLETE_MESSAGE" desc="Message shown when your OS is no longer supported. This message is followed by a 'Learn more' link.">
566 Chromium has stopped updating and no longer supports this version of yo ur operating system. 560 Chromium has stopped updating and no longer supports this version of yo ur operating system.
567 </message> 561 </message>
568 562
569 <!-- Google API keys info bar --> 563 <!-- Google API keys info bar -->
(...skipping 713 matching lines...) Expand 10 before | Expand all | Expand 10 after
1283 </message> 1277 </message>
1284 <message name="IDS_WIN_PROMPT_TO_CLOSE_APPS_FOR_DESKTOP" 1278 <message name="IDS_WIN_PROMPT_TO_CLOSE_APPS_FOR_DESKTOP"
1285 desc="Modal message box prompt shown to the user after requesti ng to relaunch in Desktop mode while packaged apps are running, which will requi re all packaged apps to be closed and then restarted. Dialog is shown with choic es: OK, Cancel."> 1279 desc="Modal message box prompt shown to the user after requesti ng to relaunch in Desktop mode while packaged apps are running, which will requi re all packaged apps to be closed and then restarted. Dialog is shown with choic es: OK, Cancel.">
1286 Relaunching in Desktop mode will close and relaunch your Chromium apps . 1280 Relaunching in Desktop mode will close and relaunch your Chromium apps .
1287 </message> 1281 </message>
1288 </if> 1282 </if>
1289 1283
1290 </messages> 1284 </messages>
1291 </release> 1285 </release>
1292 </grit> 1286 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/app/google_chrome_strings.grd » ('j') | chrome/browser/ui/webui/options/content_settings_handler.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698