diff options
| author | jhorwich@chromium.org <jhorwich@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-31 23:10:29 +0000 |
|---|---|---|
| committer | jhorwich@chromium.org <jhorwich@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-31 23:10:29 +0000 |
| commit | 7d1c8e1ebdb5d29c37679f8b449cbf03ecc9fb05 (patch) | |
| tree | e7b88f6f2166eaa0c0dc14c261c006b62dbb25dd /chrome/browser/image_decoder.h | |
| parent | 50f977c59a952c09e07dd0246622f2c8ad3e2b69 (diff) | |
| download | chromium_src-7d1c8e1ebdb5d29c37679f8b449cbf03ecc9fb05.zip chromium_src-7d1c8e1ebdb5d29c37679f8b449cbf03ecc9fb05.tar.gz chromium_src-7d1c8e1ebdb5d29c37679f8b449cbf03ecc9fb05.tar.bz2 | |
Revert r139779 "Added support for animated/nonanimated user image. There are no"
Conflicts:
chrome/browser/chromeos/login/user.cc
chrome/browser/chromeos/login/user.h
chrome/browser/chromeos/login/user_image.cc
chrome/browser/chromeos/login/user_image.h
Conflicts to user.[cc|h] caused by SkBitmap->ImageSkia conversion (r139802) so were manually fixed. "Conflicts" in user_image.[cc|h] are git noise since files were added in original CL.
BUG=130597
TEST=browser_tests gtest_filter="GuestModeOptionsBrowserTest.LoadOptionsByURL"
Review URL: https://chromiumcodereview.appspot.com/10448105
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139912 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/image_decoder.h')
| -rw-r--r-- | chrome/browser/image_decoder.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/chrome/browser/image_decoder.h b/chrome/browser/image_decoder.h index 148454b..c212d2d 100644 --- a/chrome/browser/image_decoder.h +++ b/chrome/browser/image_decoder.h @@ -40,10 +40,6 @@ class ImageDecoder : public content::UtilityProcessHostClient { // Starts image decoding. void Start(); - const std::vector<unsigned char>& get_image_data() const { - return image_data_; - } - private: // It's a reference counted object, so destructor is private. virtual ~ImageDecoder(); |