diff options
Diffstat (limited to 'views/controls')
-rwxr-xr-x | views/controls/label.cc | 4 | ||||
-rw-r--r-- | views/controls/label.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/views/controls/label.cc b/views/controls/label.cc index dff4165..79f995a 100755 --- a/views/controls/label.cc +++ b/views/controls/label.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -304,7 +304,7 @@ void Label::SetColor(const SkColor& color) { color_ = color; } -const SkColor Label::GetColor() const { +SkColor Label::GetColor() const { return color_; } diff --git a/views/controls/label.h b/views/controls/label.h index 76df4db..04e22ee 100644 --- a/views/controls/label.h +++ b/views/controls/label.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -98,13 +98,13 @@ class Label : public View { virtual void SetColor(const SkColor& color); // Return a reference to the currently used color - virtual const SkColor GetColor() const; + virtual SkColor GetColor() const; // Set and Get the highlight color virtual void SetHighlightColor(const SkColor& color) { highlight_color_ = color; } - virtual const SkColor GetHighlightColor() const { return highlight_color_; } + virtual SkColor GetHighlightColor() const { return highlight_color_; } // Whether to draw highlighted text. virtual bool DrawHighlighted() const { return highlighted_; } |