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

Unified Diff: chrome/browser/sync/engine/auth_watcher.cc

Issue 211019: Fix compiling of sync on linux. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 3 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
Index: chrome/browser/sync/engine/auth_watcher.cc
===================================================================
--- chrome/browser/sync/engine/auth_watcher.cc (revision 26817)
+++ chrome/browser/sync/engine/auth_watcher.cc (working copy)
@@ -50,16 +50,16 @@
UserSettings* user_settings,
GaiaAuthenticator* gaia_auth,
TalkMediator* talk_mediator)
- : dirman_(dirman),
+ : gaia_(gaia_auth),
+ dirman_(dirman),
scm_(scm),
allstatus_(allstatus),
status_(NOT_AUTHENTICATED),
+ user_settings_(user_settings),
+ talk_mediator_(talk_mediator),
thread_handle_valid_(false),
authenticating_now_(false),
- current_attempt_trigger_(AuthWatcherEvent::USER_INITIATED),
- user_settings_(user_settings),
- gaia_(gaia_auth),
- talk_mediator_(talk_mediator) {
+ current_attempt_trigger_(AuthWatcherEvent::USER_INITIATED) {
connmgr_hookup_.reset(
NewEventListenerHookup(scm->channel(), this,
&AuthWatcher::HandleServerConnectionEvent));
@@ -190,7 +190,7 @@
bool AuthWatcher::AuthenticateLocally(string email) {
user_settings_->GetEmailForSignin(&email);
- if (file_util::PathExists(dirman_->GetSyncDataDatabasePath())) {
+ if (file_util::PathExists(FilePath(dirman_->GetSyncDataDatabasePath()))) {
gaia_->SetUsername(email);
status_ = LOCALLY_AUTHENTICATED;
user_settings_->SwitchUser(email);
« no previous file with comments | « chrome/browser/sync/engine/auth_watcher.h ('k') | chrome/browser/sync/engine/build_and_process_conflict_sets_command.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698