diff options
| author | courage@chromium.org <courage@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-20 23:44:44 +0000 |
|---|---|---|
| committer | courage@chromium.org <courage@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-20 23:44:44 +0000 |
| commit | 9332044293a666d077a214b735a31ba9f3debed7 (patch) | |
| tree | 6e25d3d4700c186199e80fd28745e445e0341f01 /chrome/browser/extensions/api/identity/identity_api.cc | |
| parent | 6a09bfd7e92ee13cc52d7e63860d92c73aa308eb (diff) | |
| download | chromium_src-9332044293a666d077a214b735a31ba9f3debed7.zip chromium_src-9332044293a666d077a214b735a31ba9f3debed7.tar.gz chromium_src-9332044293a666d077a214b735a31ba9f3debed7.tar.bz2 | |
Enable identity.email permission and chrome.identity.getProfileUserInfo API in stable
This change makes some small tweaks to identity.email and
getProfileUserInfo based on apps-dev feedback, and enables them
in stable.
The UI string for identity.email now reads "Know your email
address". chrome.identity.getProfileUserInfo can be called
without the email permission (in which case it returns an ID
only).
BUG=368343
Review URL: https://codereview.chromium.org/337423002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@278867 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/api/identity/identity_api.cc')
| -rw-r--r-- | chrome/browser/extensions/api/identity/identity_api.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/chrome/browser/extensions/api/identity/identity_api.cc b/chrome/browser/extensions/api/identity/identity_api.cc index 320a944..710678e 100644 --- a/chrome/browser/extensions/api/identity/identity_api.cc +++ b/chrome/browser/extensions/api/identity/identity_api.cc @@ -31,6 +31,8 @@ #include "extensions/browser/event_router.h" #include "extensions/browser/extension_function_dispatcher.h" #include "extensions/common/extension.h" +#include "extensions/common/permissions/permission_set.h" +#include "extensions/common/permissions/permissions_data.h" #include "google_apis/gaia/gaia_urls.h" #include "url/gurl.h" @@ -768,8 +770,11 @@ ExtensionFunction::ResponseAction IdentityGetProfileUserInfoFunction::Run() { } api::identity::ProfileUserInfo profile_user_info; - profile_user_info.email = - GetProfile()->GetPrefs()->GetString(prefs::kGoogleServicesUsername); + if (GetExtension()->permissions_data()->HasAPIPermission( + APIPermission::kIdentityEmail)) { + profile_user_info.email = + GetProfile()->GetPrefs()->GetString(prefs::kGoogleServicesUsername); + } profile_user_info.id = GetProfile()->GetPrefs()->GetString(prefs::kGoogleServicesUserAccountId); |