| OLD | NEW |
| 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 Loading... |
| 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/url_util.h" | |
| 44 #include "chrome/common/pref_names.h" | 43 #include "chrome/common/pref_names.h" |
| 45 #include "chrome/common/url_constants.h" | 44 #include "chrome/common/url_constants.h" |
| 46 #include "chromeos/dbus/dbus_thread_manager.h" | 45 #include "chromeos/dbus/dbus_thread_manager.h" |
| 47 #include "chromeos/dbus/power_manager_client.h" | 46 #include "chromeos/dbus/power_manager_client.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" |
| 53 #include "google_apis/gaia/gaia_auth_util.h" | 52 #include "google_apis/gaia/gaia_auth_util.h" |
| (...skipping 966 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1020 username, | 1019 username, |
| 1021 CommandLine::ForCurrentProcess()->HasSwitch(switches::kForceOAuth1) ? | 1020 CommandLine::ForCurrentProcess()->HasSwitch(switches::kForceOAuth1) ? |
| 1022 User::OAUTH1_TOKEN_STATUS_INVALID : | 1021 User::OAUTH1_TOKEN_STATUS_INVALID : |
| 1023 User::OAUTH2_TOKEN_STATUS_INVALID); | 1022 User::OAUTH2_TOKEN_STATUS_INVALID); |
| 1024 | 1023 |
| 1025 login_display_->SetUIEnabled(true); | 1024 login_display_->SetUIEnabled(true); |
| 1026 login_display_->ShowGaiaPasswordChanged(username); | 1025 login_display_->ShowGaiaPasswordChanged(username); |
| 1027 } | 1026 } |
| 1028 | 1027 |
| 1029 } // namespace chromeos | 1028 } // namespace chromeos |
| OLD | NEW |