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

Unified Diff: chrome/browser/ui/browser_init.cc

Issue 4980005: Allow sync with 2-factor StrongAuth accounts in ChromeOS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Refactored 2-factor error passing Created 10 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/browser_init.cc
diff --git a/chrome/browser/ui/browser_init.cc b/chrome/browser/ui/browser_init.cc
index 84c85fffb905b6f8cf418fe155535130c9826f99..56c5b4bbf7d99436e1745bb660dd1e582de93704 100644
--- a/chrome/browser/ui/browser_init.cc
+++ b/chrome/browser/ui/browser_init.cc
@@ -870,7 +870,12 @@ std::vector<GURL> BrowserInit::LaunchWithProfile::GetURLsFromCommandLine(
ChildProcessSecurityPolicy::GetInstance();
if (policy->IsWebSafeScheme(url.scheme()) ||
url.SchemeIs(chrome::kFileScheme) ||
- !url.spec().compare(chrome::kAboutBlankURL)) {
+#if defined(OS_CHROMEOS)
+ // In ChromeOS, allow a settings page to be specified on the
+ // command line. See ExistingUserController::OnLoginSuccess.
+ (url.spec().find(chrome::kChromeUISettingsURL) == 0) ||
+#endif
+ (url.spec().compare(chrome::kAboutBlankURL) == 0)) {
urls.push_back(url);
}
}

Powered by Google App Engine
This is Rietveld 408576698