diff options
author | isherman <isherman@chromium.org> | 2015-01-22 15:01:21 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-01-22 23:02:11 +0000 |
commit | e61989b21484b652a5124d4cfad960dbd8b6946c (patch) | |
tree | 052d93a690b74b86066ab58a5ce84a85660257f3 /chrome | |
parent | ff4baff346dcac0a1963a2f7c0b7494a27dc454f (diff) | |
download | chromium_src-e61989b21484b652a5124d4cfad960dbd8b6946c.zip chromium_src-e61989b21484b652a5124d4cfad960dbd8b6946c.tar.gz chromium_src-e61989b21484b652a5124d4cfad960dbd8b6946c.tar.bz2 |
[Smart Lock] Remove the unused easyUnlockPrivate.getUserImage function.
BUG=none
TEST=none
R=tengs@chromium.org
NOTRY=true
Review URL: https://codereview.chromium.org/825033003
Cr-Commit-Position: refs/heads/master@{#312694}
Diffstat (limited to 'chrome')
3 files changed, 0 insertions, 50 deletions
diff --git a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc index b423e30..3585ffb 100644 --- a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc +++ b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc @@ -29,7 +29,6 @@ #include "chrome/browser/chromeos/chromeos_utils.h" #include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager.h" #include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_factory.h" -#include "chrome/browser/ui/webui/options/chromeos/user_image_source.h" #include "components/user_manager/user.h" #include "components/user_manager/user_manager.h" #endif @@ -693,37 +692,6 @@ bool EasyUnlockPrivateGetUserInfoFunction::RunSync() { return true; } -EasyUnlockPrivateGetUserImageFunction::EasyUnlockPrivateGetUserImageFunction() { -} - -EasyUnlockPrivateGetUserImageFunction:: - ~EasyUnlockPrivateGetUserImageFunction() { -} - -bool EasyUnlockPrivateGetUserImageFunction::RunSync() { -#if defined(OS_CHROMEOS) - EasyUnlockService* service = - EasyUnlockService::Get(Profile::FromBrowserContext(browser_context())); - const std::vector<ui::ScaleFactor>& supported_scale_factors = - ui::GetSupportedScaleFactors(); - - base::RefCountedMemory* user_image = - chromeos::options::UserImageSource::GetUserImage( - service->GetUserEmail(), supported_scale_factors.back()); - - results_ = - easy_unlock_private::GetUserImage::Results::Create(std::vector<char>( - user_image->front(), user_image->front() + user_image->size())); -#else - // TODO(tengs): Find a way to get the profile picture for non-ChromeOS - // devices. - results_ = - easy_unlock_private::GetUserImage::Results::Create(std::vector<char>()); - SetError("Not supported on non-ChromeOS platforms."); -#endif - return true; -} - EasyUnlockPrivateGetConnectionInfoFunction:: EasyUnlockPrivateGetConnectionInfoFunction() { } diff --git a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.h b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.h index 919742f..b835bde 100644 --- a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.h +++ b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.h @@ -334,21 +334,6 @@ class EasyUnlockPrivateGetUserInfoFunction : public SyncExtensionFunction { DISALLOW_COPY_AND_ASSIGN(EasyUnlockPrivateGetUserInfoFunction); }; -class EasyUnlockPrivateGetUserImageFunction : public SyncExtensionFunction { - public: - DECLARE_EXTENSION_FUNCTION("easyUnlockPrivate.getUserImage", - EASYUNLOCKPRIVATE_GETUSERIMAGE) - EasyUnlockPrivateGetUserImageFunction(); - - private: - ~EasyUnlockPrivateGetUserImageFunction() override; - - // SyncExtensionFunction: - bool RunSync() override; - - DISALLOW_COPY_AND_ASSIGN(EasyUnlockPrivateGetUserImageFunction); -}; - class EasyUnlockPrivateGetConnectionInfoFunction : public core_api::BluetoothExtensionFunction { public: diff --git a/chrome/common/extensions/api/easy_unlock_private.idl b/chrome/common/extensions/api/easy_unlock_private.idl index c65ac7d..e7b8715 100644 --- a/chrome/common/extensions/api/easy_unlock_private.idl +++ b/chrome/common/extensions/api/easy_unlock_private.idl @@ -320,9 +320,6 @@ namespace easyUnlockPrivate { // service. static void getUserInfo(GetUserInfoCallback callback); - // Gets the user's profile image as a bitmap. - static void getUserImage(DataCallback callback); - // Gets the connection info for the Bluetooth device identified by // deviceAddress. static void getConnectionInfo(DOMString deviceAddress, |