Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(72)

Side by Side Diff: views/controls/button/image_button.h

Issue 160063: Fix for a coverity reported error (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | views/controls/button/image_button.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef VIEWS_CONTROLS_BUTTON_IMAGE_BUTTON_H_ 5 #ifndef VIEWS_CONTROLS_BUTTON_IMAGE_BUTTON_H_
6 #define VIEWS_CONTROLS_BUTTON_IMAGE_BUTTON_H_ 6 #define VIEWS_CONTROLS_BUTTON_IMAGE_BUTTON_H_
7 7
8 #include "third_party/skia/include/core/SkBitmap.h" 8 #include "third_party/skia/include/core/SkBitmap.h"
9 #include "views/controls/button/custom_button.h" 9 #include "views/controls/button/custom_button.h"
10 10
(...skipping 29 matching lines...) Expand all
40 40
41 protected: 41 protected:
42 // Returns the image to paint. This is invoked from paint and returns a value 42 // Returns the image to paint. This is invoked from paint and returns a value
43 // from images. 43 // from images.
44 virtual SkBitmap GetImageToPaint(); 44 virtual SkBitmap GetImageToPaint();
45 45
46 // The images used to render the different states of this button. 46 // The images used to render the different states of this button.
47 SkBitmap images_[BS_COUNT]; 47 SkBitmap images_[BS_COUNT];
48 48
49 // The background image. 49 // The background image.
50 scoped_ptr<SkBitmap> background_image_; 50 SkBitmap background_image_;
51 51
52 private: 52 private:
53 // Image alignment. 53 // Image alignment.
54 HorizontalAlignment h_alignment_; 54 HorizontalAlignment h_alignment_;
55 VerticalAlignment v_alignment_; 55 VerticalAlignment v_alignment_;
56 56
57 DISALLOW_COPY_AND_ASSIGN(ImageButton); 57 DISALLOW_COPY_AND_ASSIGN(ImageButton);
58 }; 58 };
59 59
60 //////////////////////////////////////////////////////////////////////////////// 60 ////////////////////////////////////////////////////////////////////////////////
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 // The parent class's tooltip_text_ is displayed when not toggled, and 98 // The parent class's tooltip_text_ is displayed when not toggled, and
99 // this one is shown when toggled. 99 // this one is shown when toggled.
100 std::wstring toggled_tooltip_text_; 100 std::wstring toggled_tooltip_text_;
101 101
102 DISALLOW_EVIL_CONSTRUCTORS(ToggleImageButton); 102 DISALLOW_EVIL_CONSTRUCTORS(ToggleImageButton);
103 }; 103 };
104 104
105 } // namespace views 105 } // namespace views
106 106
107 #endif // VIEWS_CONTROLS_BUTTON_IMAGE_BUTTON_H_ 107 #endif // VIEWS_CONTROLS_BUTTON_IMAGE_BUTTON_H_
OLDNEW
« no previous file with comments | « no previous file | views/controls/button/image_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698