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

Side by Side Diff: ui/views/controls/image_view.h

Issue 117983002: Prefix string16 with base:: in ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 7 years 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 | « ui/views/controls/combobox/combobox_unittest.cc ('k') | ui/views/controls/image_view.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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 UI_VIEWS_CONTROLS_IMAGE_VIEW_H_ 5 #ifndef UI_VIEWS_CONTROLS_IMAGE_VIEW_H_
6 #define UI_VIEWS_CONTROLS_IMAGE_VIEW_H_ 6 #define UI_VIEWS_CONTROLS_IMAGE_VIEW_H_
7 7
8 #include "ui/gfx/image/image_skia.h" 8 #include "ui/gfx/image/image_skia.h"
9 #include "ui/views/view.h" 9 #include "ui/views/view.h"
10 10
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 65
66 // Set / Get the horizontal alignment. 66 // Set / Get the horizontal alignment.
67 void SetHorizontalAlignment(Alignment ha); 67 void SetHorizontalAlignment(Alignment ha);
68 Alignment GetHorizontalAlignment() const; 68 Alignment GetHorizontalAlignment() const;
69 69
70 // Set / Get the vertical alignment. 70 // Set / Get the vertical alignment.
71 void SetVerticalAlignment(Alignment va); 71 void SetVerticalAlignment(Alignment va);
72 Alignment GetVerticalAlignment() const; 72 Alignment GetVerticalAlignment() const;
73 73
74 // Set / Get the tooltip text. 74 // Set / Get the tooltip text.
75 void SetTooltipText(const string16& tooltip); 75 void SetTooltipText(const base::string16& tooltip);
76 string16 GetTooltipText() const; 76 base::string16 GetTooltipText() const;
77 77
78 void set_interactive(bool interactive) { interactive_ = interactive; } 78 void set_interactive(bool interactive) { interactive_ = interactive; }
79 79
80 void SetFocusPainter(scoped_ptr<Painter> focus_painter); 80 void SetFocusPainter(scoped_ptr<Painter> focus_painter);
81 81
82 // Overriden from View: 82 // Overriden from View:
83 virtual gfx::Size GetPreferredSize() OVERRIDE; 83 virtual gfx::Size GetPreferredSize() OVERRIDE;
84 virtual void OnFocus() OVERRIDE; 84 virtual void OnFocus() OVERRIDE;
85 virtual void OnBlur() OVERRIDE; 85 virtual void OnBlur() OVERRIDE;
86 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; 86 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
87 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE; 87 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
88 virtual bool GetTooltipText(const gfx::Point& p, 88 virtual bool GetTooltipText(const gfx::Point& p,
89 string16* tooltip) const OVERRIDE; 89 base::string16* tooltip) const OVERRIDE;
90 virtual bool HitTestRect(const gfx::Rect& rect) const OVERRIDE; 90 virtual bool HitTestRect(const gfx::Rect& rect) const OVERRIDE;
91 91
92 private: 92 private:
93 void OnPaintImage(gfx::Canvas* canvas); 93 void OnPaintImage(gfx::Canvas* canvas);
94 94
95 // Returns true if |img| is the same as the last image we painted. This is 95 // Returns true if |img| is the same as the last image we painted. This is
96 // intended to be a quick check, not exhaustive. In other words it's possible 96 // intended to be a quick check, not exhaustive. In other words it's possible
97 // for this to return false even though the images are in fact equal. 97 // for this to return false even though the images are in fact equal.
98 bool IsImageEqual(const gfx::ImageSkia& img) const; 98 bool IsImageEqual(const gfx::ImageSkia& img) const;
99 99
(...skipping 10 matching lines...) Expand all
110 // The underlying image. 110 // The underlying image.
111 gfx::ImageSkia image_; 111 gfx::ImageSkia image_;
112 112
113 // Horizontal alignment. 113 // Horizontal alignment.
114 Alignment horiz_alignment_; 114 Alignment horiz_alignment_;
115 115
116 // Vertical alignment. 116 // Vertical alignment.
117 Alignment vert_alignment_; 117 Alignment vert_alignment_;
118 118
119 // The current tooltip text. 119 // The current tooltip text.
120 string16 tooltip_text_; 120 base::string16 tooltip_text_;
121 121
122 // A flag controlling hit test handling for interactivity. 122 // A flag controlling hit test handling for interactivity.
123 bool interactive_; 123 bool interactive_;
124 124
125 // Scale last painted at. 125 // Scale last painted at.
126 float last_paint_scale_; 126 float last_paint_scale_;
127 127
128 // Address of bytes we last painted. This is used only for comparison, so its 128 // Address of bytes we last painted. This is used only for comparison, so its
129 // safe to cache. 129 // safe to cache.
130 void* last_painted_bitmap_pixels_; 130 void* last_painted_bitmap_pixels_;
131 131
132 scoped_ptr<views::Painter> focus_painter_; 132 scoped_ptr<views::Painter> focus_painter_;
133 133
134 DISALLOW_COPY_AND_ASSIGN(ImageView); 134 DISALLOW_COPY_AND_ASSIGN(ImageView);
135 }; 135 };
136 136
137 } // namespace views 137 } // namespace views
138 138
139 #endif // UI_VIEWS_CONTROLS_IMAGE_VIEW_H_ 139 #endif // UI_VIEWS_CONTROLS_IMAGE_VIEW_H_
OLDNEW
« no previous file with comments | « ui/views/controls/combobox/combobox_unittest.cc ('k') | ui/views/controls/image_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698