summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
authorjohnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-08 01:38:35 +0000
committerjohnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-08 01:38:35 +0000
commit265d8c32bd4dbb4b1a142c8204b434a03e8a8c8f (patch)
tree105095d5eead4db62bbf60ed0b3f1d243b202e76 /chrome/common
parent8b20191a72da085319a68e4953e9f2b355218825 (diff)
downloadchromium_src-265d8c32bd4dbb4b1a142c8204b434a03e8a8c8f.zip
chromium_src-265d8c32bd4dbb4b1a142c8204b434a03e8a8c8f.tar.gz
chromium_src-265d8c32bd4dbb4b1a142c8204b434a03e8a8c8f.tar.bz2
Revert 58778 - New authorization framework for sync.
To quote chron's original patch (http://codereview.chromium.org/3148036/show) <blockquote> This patch removes: authenticator.cc, auth_watcher.cc removes calls to user_settings.cc, removes an authenticate PB request to the server, and moves token storage into the Chrome TokenService. This patch introduces the SigninManager, which is an interim solution for user management prior to moving the system into chrome. Other changes include removing the dependency on the sync backend to be running while the sync wizard is intially displayed. This means that the backend can be brought up in response to credentials becoming available. The backend now is always provided credentials on startup. If an auth error occurs, it propogates it up via a notification. Some event handlers were removed and streamlined for more straightforward sync system startup. </blockquote> BUG=51001, 50293, 35158 TEST=Unit tests && Start up sync, log in, log out, run with expired credentials, run with new gaia credentials, run with gaia credentials updated while system is syncing. Try logging in with incorrect username. Trigger CAPTCHA. Try logging out and in repeatedly. Check about:sync works. Try going offline and back online again. Expire gaia credentials and try renewing it with the UI dialog. Review URL: http://codereview.chromium.org/3305003 TBR=johnnyg@chromium.org Review URL: http://codereview.chromium.org/3310019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58782 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r--chrome/common/notification_type.h31
-rw-r--r--chrome/common/pref_names.cc7
-rw-r--r--chrome/common/pref_names.h2
3 files changed, 4 insertions, 36 deletions
diff --git a/chrome/common/notification_type.h b/chrome/common/notification_type.h
index 834b9e5..df520c6 100644
--- a/chrome/common/notification_type.h
+++ b/chrome/common/notification_type.h
@@ -1045,13 +1045,6 @@ class NotificationType {
// are a ChromeCookieDetails object.
COOKIE_CHANGED,
- // Sidebar -----------------------------------------------------------------
-
- // Sent when the sidebar state is changed.
- // The source is a SidebarManager instance, the details are the changed
- // SidebarContainer object.
- SIDEBAR_CHANGED,
-
// Token Service -----------------------------------------------------------
// When the token service has a new token available for a service, one of
@@ -1060,32 +1053,16 @@ class NotificationType {
// TokenAvailableDetails object.
TOKEN_AVAILABLE,
- // When there aren't any additional tokens left to load, this notification
- // is sent.
- // The source is a TokenService on the profile. There are no details.
- TOKEN_LOADING_FINISHED,
+ // Sent when the sidebar state is changed.
+ // The source is a SidebarManager instance, the details are the changed
+ // SidebarContainer object.
+ SIDEBAR_CHANGED,
// If a token request failed, one of these is issued per failed request.
// The source is a TokenService on the Profile. The details are a
// TokenRequestFailedDetails object.
TOKEN_REQUEST_FAILED,
- // When a service has a new token they got from a frontend that the
- // TokenService should know about, fire this notification. The details
- // are a TokenAvailableDetails object.
- TOKEN_UPDATED,
-
- // Sent when a user signs into Google services such as sync.
- // The source is the SigninManager instance. The details are a
- // GoogleServiceSignin object.
- GOOGLE_SIGNIN_SUCCESSFUL,
-
- // Sent when a user fails to sign into Google services such as sync.
- // The source is the SigninManager instance. The details are a
- // GoogleServiceAuthError object.
- GOOGLE_SIGNIN_FAILED,
-
-
// Misc --------------------------------------------------------------------
#if defined(OS_CHROMEOS)
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
index 168f4e8..2cd8b84 100644
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -923,17 +923,10 @@ const char kSyncManaged[] = "sync.managed";
// used when sync is disabled by the user via the privacy dashboard.
const char kSyncSuppressStart[] = "sync.suppress_start";
-// Boolean to reperesent if sync credentials have been migrated from the
-// user settings DB to the token service.
-const char kSyncCredentialsMigrated[] = "sync.credentials_migrated";
-
// A string that can be used to restore sync encryption infrastructure on
// startup so that the user doesn't need to provide credentials on each start.
const char kEncryptionBootstrapToken[] = "sync.encryption_bootstrap_token";
-// String that identifies the user logged into sync and other google services.
-const char kGoogleServicesUsername[] = "google.services.username";
-
// Create web application shortcut dialog preferences.
const char kWebAppCreateOnDesktop[] = "browser.web_app.create_on_desktop";
const char kWebAppCreateInAppsMenu[] = "browser.web_app.create_in_apps_menu";
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
index 1caaa31b..6321c6a 100644
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -342,8 +342,6 @@ extern const char kSyncTypedUrls[];
extern const char kSyncExtensions[];
extern const char kSyncManaged[];
extern const char kSyncSuppressStart[];
-extern const char kGoogleServicesUsername[];
-extern const char kSyncCredentialsMigrated[];
extern const char kEncryptionBootstrapToken[];
extern const char kWebAppCreateOnDesktop[];