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

Side by Side Diff: chrome/browser/chromeos/login/existing_user_controller.cc

Issue 10928017: Moving google_apis and GaiaClient to src/google_apis. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head Created 8 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/chromeos/login/existing_user_controller.h" 5 #include "chrome/browser/chromeos/login/existing_user_controller.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 22 matching lines...) Expand all
33 #include "chrome/browser/chromeos/settings/cros_settings.h" 33 #include "chrome/browser/chromeos/settings/cros_settings.h"
34 #include "chrome/browser/chromeos/system/statistics_provider.h" 34 #include "chrome/browser/chromeos/system/statistics_provider.h"
35 #include "chrome/browser/google/google_util.h" 35 #include "chrome/browser/google/google_util.h"
36 #include "chrome/browser/policy/policy_service.h" 36 #include "chrome/browser/policy/policy_service.h"
37 #include "chrome/browser/prefs/pref_service.h" 37 #include "chrome/browser/prefs/pref_service.h"
38 #include "chrome/browser/prefs/session_startup_pref.h" 38 #include "chrome/browser/prefs/session_startup_pref.h"
39 #include "chrome/browser/profiles/profile_manager.h" 39 #include "chrome/browser/profiles/profile_manager.h"
40 #include "chrome/common/chrome_notification_types.h" 40 #include "chrome/common/chrome_notification_types.h"
41 #include "chrome/common/chrome_switches.h" 41 #include "chrome/common/chrome_switches.h"
42 #include "chrome/common/chrome_version_info.h" 42 #include "chrome/common/chrome_version_info.h"
43 #include "chrome/common/net/gaia/google_service_auth_error.h"
44 #include "chrome/common/net/url_util.h" 43 #include "chrome/common/net/url_util.h"
45 #include "chrome/common/pref_names.h" 44 #include "chrome/common/pref_names.h"
46 #include "chrome/common/url_constants.h" 45 #include "chrome/common/url_constants.h"
47 #include "chromeos/dbus/dbus_thread_manager.h" 46 #include "chromeos/dbus/dbus_thread_manager.h"
48 #include "chromeos/dbus/session_manager_client.h" 47 #include "chromeos/dbus/session_manager_client.h"
49 #include "content/public/browser/browser_thread.h" 48 #include "content/public/browser/browser_thread.h"
50 #include "content/public/browser/notification_service.h" 49 #include "content/public/browser/notification_service.h"
51 #include "content/public/browser/notification_types.h" 50 #include "content/public/browser/notification_types.h"
52 #include "content/public/browser/user_metrics.h" 51 #include "content/public/browser/user_metrics.h"
52 #include "google_apis/gaia/google_service_auth_error.h"
53 #include "grit/generated_resources.h" 53 #include "grit/generated_resources.h"
54 #include "net/http/http_auth_cache.h" 54 #include "net/http/http_auth_cache.h"
55 #include "net/http/http_network_session.h" 55 #include "net/http/http_network_session.h"
56 #include "net/http/http_transaction_factory.h" 56 #include "net/http/http_transaction_factory.h"
57 #include "net/url_request/url_request_context.h" 57 #include "net/url_request/url_request_context.h"
58 #include "net/url_request/url_request_context_getter.h" 58 #include "net/url_request/url_request_context_getter.h"
59 #include "ui/base/l10n/l10n_util.h" 59 #include "ui/base/l10n/l10n_util.h"
60 #include "ui/views/widget/widget.h" 60 #include "ui/views/widget/widget.h"
61 61
62 namespace chromeos { 62 namespace chromeos {
(...skipping 859 matching lines...) Expand 10 before | Expand all | Expand 10 after
922 // Invalidate OAuth token, since it can't be correct after password is 922 // Invalidate OAuth token, since it can't be correct after password is
923 // changed. 923 // changed.
924 UserManager::Get()->SaveUserOAuthStatus(username, 924 UserManager::Get()->SaveUserOAuthStatus(username,
925 User::OAUTH_TOKEN_STATUS_INVALID); 925 User::OAUTH_TOKEN_STATUS_INVALID);
926 926
927 login_display_->SetUIEnabled(true); 927 login_display_->SetUIEnabled(true);
928 login_display_->ShowGaiaPasswordChanged(username); 928 login_display_->ShowGaiaPasswordChanged(username);
929 } 929 }
930 930
931 } // namespace chromeos 931 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698