summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-20 23:51:45 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-20 23:51:45 +0000
commit26f92983893f8b8c7824de82ee8c4668751bd589 (patch)
tree63caa5b3a399e50911a78ae89f72882c06f1c997
parentd5a8fc03bf300ecfd8015b7911be36aa7f45edc5 (diff)
downloadchromium_src-26f92983893f8b8c7824de82ee8c4668751bd589.zip
chromium_src-26f92983893f8b8c7824de82ee8c4668751bd589.tar.gz
chromium_src-26f92983893f8b8c7824de82ee8c4668751bd589.tar.bz2
views: Do not pass SkColor by const-reference as it's defined as POD(integer). Final patch.
This is a follow up to r128782. R=pkasting@chromium.org Review URL: https://chromiumcodereview.appspot.com/10169016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133306 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/ui/views/detachable_toolbar_view.cc12
-rw-r--r--chrome/browser/ui/views/detachable_toolbar_view.h8
-rw-r--r--chrome/browser/ui/views/location_bar/ev_bubble_view.cc4
-rw-r--r--chrome/browser/ui/views/location_bar/ev_bubble_view.h4
-rw-r--r--chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc2
-rw-r--r--chrome/browser/ui/views/location_bar/icon_label_bubble_view.h4
-rw-r--r--chrome/browser/ui/views/location_bar/selected_keyword_view.cc2
-rw-r--r--chrome/browser/ui/views/location_bar/selected_keyword_view.h4
-rw-r--r--chrome/browser/ui/webui/ntp/favicon_webui_handler.cc2
9 files changed, 22 insertions, 20 deletions
diff --git a/chrome/browser/ui/views/detachable_toolbar_view.cc b/chrome/browser/ui/views/detachable_toolbar_view.cc
index 77505d8..026b7ea 100644
--- a/chrome/browser/ui/views/detachable_toolbar_view.cc
+++ b/chrome/browser/ui/views/detachable_toolbar_view.cc
@@ -104,11 +104,13 @@ void DetachableToolbarView::PaintContentAreaBorder(
}
// static
-void DetachableToolbarView::PaintVerticalDivider(
- gfx::Canvas* canvas, int x, int height, int vertical_padding,
- const SkColor& top_color,
- const SkColor& middle_color,
- const SkColor& bottom_color) {
+void DetachableToolbarView::PaintVerticalDivider(gfx::Canvas* canvas,
+ int x,
+ int height,
+ int vertical_padding,
+ SkColor top_color,
+ SkColor middle_color,
+ SkColor bottom_color) {
// Draw the upper half of the divider.
SkPaint paint;
SkSafeUnref(paint.setShader(gfx::CreateGradientShader(vertical_padding + 1,
diff --git a/chrome/browser/ui/views/detachable_toolbar_view.h b/chrome/browser/ui/views/detachable_toolbar_view.h
index 9def691..52374c0 100644
--- a/chrome/browser/ui/views/detachable_toolbar_view.h
+++ b/chrome/browser/ui/views/detachable_toolbar_view.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
@@ -79,9 +79,9 @@ class DetachableToolbarView : public views::AccessiblePaneView {
int x,
int height,
int vertical_padding,
- const SkColor& top_color,
- const SkColor& middle_color,
- const SkColor& bottom_color);
+ SkColor top_color,
+ SkColor middle_color,
+ SkColor bottom_color);
private:
DISALLOW_COPY_AND_ASSIGN(DetachableToolbarView);
diff --git a/chrome/browser/ui/views/location_bar/ev_bubble_view.cc b/chrome/browser/ui/views/location_bar/ev_bubble_view.cc
index 02288d7..93a73c7 100644
--- a/chrome/browser/ui/views/location_bar/ev_bubble_view.cc
+++ b/chrome/browser/ui/views/location_bar/ev_bubble_view.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
@@ -6,7 +6,7 @@
EVBubbleView::EVBubbleView(const int background_images[],
int contained_image,
- const SkColor& color,
+ SkColor color,
LocationBarView* location_bar)
: IconLabelBubbleView(background_images, contained_image, color),
ALLOW_THIS_IN_INITIALIZER_LIST(click_handler_(this, location_bar)) {
diff --git a/chrome/browser/ui/views/location_bar/ev_bubble_view.h b/chrome/browser/ui/views/location_bar/ev_bubble_view.h
index 9c9bfb3..a2ea812 100644
--- a/chrome/browser/ui/views/location_bar/ev_bubble_view.h
+++ b/chrome/browser/ui/views/location_bar/ev_bubble_view.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
@@ -20,7 +20,7 @@ class EVBubbleView : public IconLabelBubbleView {
public:
EVBubbleView(const int background_images[],
int contained_image,
- const SkColor& color,
+ SkColor color,
LocationBarView* location_bar);
virtual ~EVBubbleView();
diff --git a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc
index 674db57..04fd098 100644
--- a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc
+++ b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc
@@ -21,7 +21,7 @@ static const int kLabelPadding = 5;
IconLabelBubbleView::IconLabelBubbleView(const int background_images[],
int contained_image,
- const SkColor& color)
+ SkColor color)
: background_painter_(background_images),
is_extension_icon_(false) {
image_ = new views::ImageView();
diff --git a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.h b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.h
index 580b9f6..0764c85 100644
--- a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.h
+++ b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
@@ -31,7 +31,7 @@ class IconLabelBubbleView : public views::View {
public:
IconLabelBubbleView(const int background_images[],
int contained_image,
- const SkColor& color);
+ SkColor color);
virtual ~IconLabelBubbleView();
void SetFont(const gfx::Font& font);
diff --git a/chrome/browser/ui/views/location_bar/selected_keyword_view.cc b/chrome/browser/ui/views/location_bar/selected_keyword_view.cc
index 55f537d..b8edbaf 100644
--- a/chrome/browser/ui/views/location_bar/selected_keyword_view.cc
+++ b/chrome/browser/ui/views/location_bar/selected_keyword_view.cc
@@ -16,7 +16,7 @@
SelectedKeywordView::SelectedKeywordView(const int background_images[],
int contained_image,
- const SkColor& color,
+ SkColor color,
Profile* profile)
: IconLabelBubbleView(background_images, contained_image, color),
profile_(profile) {
diff --git a/chrome/browser/ui/views/location_bar/selected_keyword_view.h b/chrome/browser/ui/views/location_bar/selected_keyword_view.h
index 9028ae0..d1ef0bf 100644
--- a/chrome/browser/ui/views/location_bar/selected_keyword_view.h
+++ b/chrome/browser/ui/views/location_bar/selected_keyword_view.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
@@ -23,7 +23,7 @@ class SelectedKeywordView : public IconLabelBubbleView {
public:
SelectedKeywordView(const int background_images[],
int contained_image,
- const SkColor& color,
+ SkColor color,
Profile* profile);
virtual ~SelectedKeywordView();
diff --git a/chrome/browser/ui/webui/ntp/favicon_webui_handler.cc b/chrome/browser/ui/webui/ntp/favicon_webui_handler.cc
index c10c14a..a21aaaf 100644
--- a/chrome/browser/ui/webui/ntp/favicon_webui_handler.cc
+++ b/chrome/browser/ui/webui/ntp/favicon_webui_handler.cc
@@ -25,7 +25,7 @@
namespace {
-StringValue* SkColorToCss(const SkColor& color) {
+StringValue* SkColorToCss(SkColor color) {
return new StringValue(base::StringPrintf("rgb(%d, %d, %d)",
SkColorGetR(color),
SkColorGetG(color),