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

Side by Side Diff: chrome/browser/browser_main.cc

Issue 7639004: [ChromeOS] Always fetch oauth cooken when signing in via extension. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix chromeos trybot Created 9 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/existing_user_controller.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 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/browser_main.h" 5 #include "chrome/browser/browser_main.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 1156 matching lines...) Expand 10 before | Expand all | Expand 10 after
1167 const std::string& password, 1167 const std::string& password,
1168 const GaiaAuthConsumer::ClientLoginResult& credentials, 1168 const GaiaAuthConsumer::ClientLoginResult& credentials,
1169 bool pending_requests, 1169 bool pending_requests,
1170 bool using_oauth) { 1170 bool using_oauth) {
1171 // Will call OnProfilePrepared in the end. 1171 // Will call OnProfilePrepared in the end.
1172 chromeos::LoginUtils::Get()->PrepareProfile(username, 1172 chromeos::LoginUtils::Get()->PrepareProfile(username,
1173 password, 1173 password,
1174 credentials, 1174 credentials,
1175 pending_requests, 1175 pending_requests,
1176 using_oauth, 1176 using_oauth,
1177 false,
1177 this); 1178 this);
1178 } 1179 }
1179 1180
1180 // LoginUtils::Delegate implementation: 1181 // LoginUtils::Delegate implementation:
1181 virtual void OnProfilePrepared(Profile* profile) { 1182 virtual void OnProfilePrepared(Profile* profile) {
1182 chromeos::LoginUtils::DoBrowserLaunch(profile, NULL); 1183 chromeos::LoginUtils::DoBrowserLaunch(profile, NULL);
1183 delete this; 1184 delete this;
1184 } 1185 }
1185 1186
1186 scoped_refptr<chromeos::Authenticator> authenticator_; 1187 scoped_refptr<chromeos::Authenticator> authenticator_;
(...skipping 971 matching lines...) Expand 10 before | Expand all | Expand 10 after
2158 #if defined(OS_CHROMEOS) 2159 #if defined(OS_CHROMEOS)
2159 // To be precise, logout (browser shutdown) is not yet done, but the 2160 // To be precise, logout (browser shutdown) is not yet done, but the
2160 // remaining work is negligible, hence we say LogoutDone here. 2161 // remaining work is negligible, hence we say LogoutDone here.
2161 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone", 2162 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone",
2162 false); 2163 false);
2163 chromeos::BootTimesLoader::Get()->WriteLogoutTimes(); 2164 chromeos::BootTimesLoader::Get()->WriteLogoutTimes();
2164 #endif 2165 #endif
2165 TRACE_EVENT_END_ETW("BrowserMain", 0, 0); 2166 TRACE_EVENT_END_ETW("BrowserMain", 0, 0);
2166 return result_code; 2167 return result_code;
2167 } 2168 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/existing_user_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698