diff options
| author | cmasone@google.com <cmasone@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-11 00:33:58 +0000 |
|---|---|---|
| committer | cmasone@google.com <cmasone@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-11 00:33:58 +0000 |
| commit | 33aed19aa769a11de1c92511affaed0c327a654b (patch) | |
| tree | 84af5f1548b36b17110208fad3efd7c268b966a3 | |
| parent | 8609397d9932b0f743dd4bbe55246632fb597945 (diff) | |
| download | chromium_src-33aed19aa769a11de1c92511affaed0c327a654b.zip chromium_src-33aed19aa769a11de1c92511affaed0c327a654b.tar.gz chromium_src-33aed19aa769a11de1c92511affaed0c327a654b.tar.bz2 | |
Code got moved out from under me, and when I merged, I missed a line. People not using my new code will be unaffected, but this change makes it so the new stuff works again.
Review URL: http://codereview.chromium.org/826003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41227 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/chromeos/login/utils.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/login/utils.cc b/chrome/browser/chromeos/login/utils.cc index 54f7ee1..9417c41 100644 --- a/chrome/browser/chromeos/login/utils.cc +++ b/chrome/browser/chromeos/login/utils.cc @@ -15,6 +15,7 @@ #include "chrome/browser/profile.h" #include "chrome/browser/profile_manager.h" #include "chrome/common/chrome_paths.h" +#include "chrome/common/chrome_switches.h" #include "chrome/common/notification_service.h" #include "views/widget/widget_gtk.h" @@ -45,7 +46,8 @@ void CompleteLogin(const std::string& username) { Profile* profile = profile_manager->GetDefaultProfile(user_data_dir); int return_code; - ExternalCookieHandler::GetCookies(command_line, profile); + if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kInChromeAuth)) + ExternalCookieHandler::GetCookies(command_line, profile); browser_init.LaunchBrowser(command_line, profile, std::wstring(), true, &return_code); } |