diff options
author | bcwhite@chromium.org <bcwhite@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-26 01:17:14 +0000 |
---|---|---|
committer | bcwhite@chromium.org <bcwhite@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-26 01:17:14 +0000 |
commit | 0dfa66afc89ad97e91b2249bf8b357e57445f69b (patch) | |
tree | 8d8168377c04255ace9ee56962acfd5cba6e4c6e /google_apis/gaia/gaia_urls.cc | |
parent | ed5eff4235692155eed75b8cfaf5e7340b4c2ce8 (diff) | |
download | chromium_src-0dfa66afc89ad97e91b2249bf8b357e57445f69b.zip chromium_src-0dfa66afc89ad97e91b2249bf8b357e57445f69b.tar.gz chromium_src-0dfa66afc89ad97e91b2249bf8b357e57445f69b.tar.bz2 |
Add ability to sign-out of Google directly from profile switcher menu.
As part of the plan to make sync sign-in more integral to a user's profile, we're adding an explicit ability to "sign out" of the profile in place of signing out of Google inside the content area. This CL adds that basic sign-out functionality by adding a "sign out" button to the avatar menu that, when clicked, goes through the steps of signing out of Google and closing all browser windows associated with that profile.
Future CLs will do the Right Thing(tm) of requiring sign-in before opening that profile so that the tabs can resume where there were, just as though there had been no sign-out event.
The UI included here is temporary. A new profile-switcher menu is being discussed and the core functionality included here will eventually get triggered from that once the design is finalized. In other words, the UI presented here will eventually be replaced.
See it in action:
https://docs.google.com/a/google.com/file/d/0B4S7cIAPVn9XdzJFZXl2SncxMlE/edit?usp=sharing
Previous avatar menu:
https://docs.google.com/a/google.com/file/d/0B4S7cIAPVn9XY3dZMXRUNGtHd3M/edit?usp=sharing
To test:
- launch with --enable-profile-signout
- create a second profile (so Avatar menu appears)
- sign-in to a Google account (like gmail)
- open Avatar menu and click the "sign out" button
- (window will close when sign-out is complete)
- re-open profile
- go to a Google account
- note that you are not signed in
BUG=
Review URL: https://chromiumcodereview.appspot.com/12726012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@196569 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'google_apis/gaia/gaia_urls.cc')
-rw-r--r-- | google_apis/gaia/gaia_urls.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/google_apis/gaia/gaia_urls.cc b/google_apis/gaia/gaia_urls.cc index f11ba89..543bd88 100644 --- a/google_apis/gaia/gaia_urls.cc +++ b/google_apis/gaia/gaia_urls.cc @@ -18,6 +18,7 @@ const char kCaptchaUrlPrefixSuffix[] = "/"; // API calls from accounts.google.com const char kClientLoginUrlSuffix[] = "/ClientLogin"; const char kServiceLoginUrlSuffix[] = "/ServiceLogin"; +const char kServiceLogoutUrlSuffix[] = "/Logout"; const char kIssueAuthTokenUrlSuffix[] = "/IssueAuthToken"; const char kGetUserInfoUrlSuffix[] = "/GetUserInfo"; const char kTokenAuthUrlSuffix[] = "/TokenAuth"; @@ -100,6 +101,7 @@ GaiaUrls::GaiaUrls() { gaia_login_form_realm_ = gaia_url_base + "/"; client_login_url_ = gaia_url_base + kClientLoginUrlSuffix; service_login_url_ = gaia_url_base + kServiceLoginUrlSuffix; + service_logout_url_ = gaia_url_base + kServiceLogoutUrlSuffix; issue_auth_token_url_ = gaia_url_base + kIssueAuthTokenUrlSuffix; get_user_info_url_ = gaia_url_base + kGetUserInfoUrlSuffix; token_auth_url_ = gaia_url_base + kTokenAuthUrlSuffix; @@ -164,6 +166,10 @@ const std::string& GaiaUrls::service_login_url() { return service_login_url_; } +const std::string& GaiaUrls::service_logout_url() { + return service_logout_url_; +} + const std::string& GaiaUrls::issue_auth_token_url() { return issue_auth_token_url_; } |