diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-30 01:03:53 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-30 01:03:53 +0000 |
| commit | 5dfe0dcc0e08a38284f66b6b882ce6f215ebc120 (patch) | |
| tree | d1e60eba92f36ae9370f295bdf6de0666d383f40 /views/controls | |
| parent | 49cc504342b6b60f152d999f410e59c728925a17 (diff) | |
| download | chromium_src-5dfe0dcc0e08a38284f66b6b882ce6f215ebc120.zip chromium_src-5dfe0dcc0e08a38284f66b6b882ce6f215ebc120.tar.gz chromium_src-5dfe0dcc0e08a38284f66b6b882ce6f215ebc120.tar.bz2 | |
Windows: Replace tabs in content settings with a listbox.
Depends on http://codereview.chromium.org/2815034
BUG=45546
TEST=Open content settings dialog. Should have a list on the left instead of tabs on top. Other than that, the dialog should work as before.
Review URL: http://codereview.chromium.org/2799042
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51205 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls')
| -rw-r--r-- | views/controls/label.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/views/controls/label.h b/views/controls/label.h index e25494e..a749be8 100644 --- a/views/controls/label.h +++ b/views/controls/label.h @@ -50,7 +50,7 @@ class Label : public View { Label(const std::wstring& text, const gfx::Font& font); virtual ~Label(); - // Overridden to compute the size required to display this label + // Overridden to compute the size required to display this label. virtual gfx::Size GetPreferredSize(); // Overriden to return the baseline of the label. @@ -58,7 +58,7 @@ class Label : public View { // Return the height necessary to display this label with the provided width. // This method is used to layout multi-line labels. It is equivalent to - // GetPreferredSize().height() if the receiver is not multi-line + // GetPreferredSize().height() if the receiver is not multi-line. virtual int GetHeightForWidth(int w); // Overriden to dirty our text bounds if we're multi-line. @@ -72,7 +72,7 @@ class Label : public View { virtual void Paint(gfx::Canvas* canvas); // If the mouse is over the label, and a mouse over background has been - // specified, its used. Otherwise super's implementation is invoked + // specified, its used. Otherwise super's implementation is invoked. virtual void PaintBackground(gfx::Canvas* canvas); // Set the font. @@ -96,7 +96,7 @@ class Label : public View { // Set the color virtual void SetColor(const SkColor& color) { color_ = color; } - // Return a reference to the currently used color + // Return a reference to the currently used color. virtual SkColor GetColor() const { return color_; } // Set horizontal alignment. If the locale is RTL, and the RTL alignment |