| Index: views/controls/button/image_button.h
|
| ===================================================================
|
| --- views/controls/button/image_button.h (revision 21771)
|
| +++ views/controls/button/image_button.h (working copy)
|
| @@ -47,7 +47,7 @@
|
| SkBitmap images_[BS_COUNT];
|
|
|
| // The background image.
|
| - scoped_ptr<SkBitmap> background_image_;
|
| + SkBitmap background_image_;
|
|
|
| private:
|
| // Image alignment.
|
|
|
| Property changes on: views\controls\button\image_button.h
|
| ___________________________________________________________________
|
| Modified: svn:mergeinfo
|
| Merged /trunk/src/views/controls/button/image_button.h:r21544
|
|
|
|
|