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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/about_flags.cc

Issue 11991002: Merge 176800 (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1364/src/
Patch Set: Created 7 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/chromeos/chrome_browser_main_chromeos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/about_flags.cc
===================================================================
--- chrome/browser/about_flags.cc (revision 177312)
+++ chrome/browser/about_flags.cc (working copy)
@@ -885,6 +885,13 @@
#endif // defined(USE_ASH)
#if defined(OS_CHROMEOS)
{
+ "force-oauth1",
+ IDS_FLAGS_FORCE_OAUTH1_DISPLAY_NAME,
+ IDS_FLAGS_FORCE_OAUTH1_DISPLAY_DESCRIPTION,
+ kOsCrOS,
+ SINGLE_VALUE_TYPE(::switches::kForceOAuth1),
+ },
+ {
"disable-new-oobe",
IDS_FLAGS_DISABLE_NEW_OOBE,
IDS_FLAGS_DISABLE_NEW_OOBE_DESCRIPTION,
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/chromeos/chrome_browser_main_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698