Revert 38828 - Make clicking on side tabs to select them work.

Use a simple round rect for the visual treatment.
Add some rect conversion utils.

http://crbug.com/34509
TEST=none

Review URL: http://codereview.chromium.org/597012

TBR=ben@chromium.org

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38834 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 0 insertions, 89 deletions

diff --git a/app/app_base.gypi b/app/app_base.gypi
index 81305aa..fdc8854 100644
--- a/app/app_base.gypi
+++ b/app/app_base.gypi
@@ -150,8 +150,6 @@
         'gfx/scrollbar_size.h',
         'gfx/skbitmap_operations.cc',
         'gfx/skbitmap_operations.h',
-        'gfx/skia_util.cc',
-        'gfx/skia_util.h',
         'gfx/text_elider.cc',
         'gfx/text_elider.h',
         'gtk_dnd_util.cc',
diff --git a/app/gfx/canvas.cc b/app/gfx/canvas.cc
index 420c984..306531c4 100644
--- a/app/gfx/canvas.cc
+++ b/app/gfx/canvas.cc
@@ -221,14 +221,6 @@ void Canvas::DrawStringInt(const std::wstring& text,
                 l10n_util::DefaultCanvasTextAlignment());
 }
 
-void Canvas::DrawStringInt(const std::wstring& text,
-                           const gfx::Font& font,
-                           const SkColor& color,
-                           const gfx::Rect& display_rect) {
-  DrawStringInt(text, font, color, display_rect.x(), display_rect.y(),
-                display_rect.width(), display_rect.height());
-}
-
 void Canvas::TileImageInt(const SkBitmap& bitmap, int x, int y, int w, int h) {
   TileImageInt(bitmap, 0, 0, x, y, w, h);
 }
diff --git a/app/gfx/canvas.h b/app/gfx/canvas.h
index 79eed9c..e59db16 100644
--- a/app/gfx/canvas.h
+++ b/app/gfx/canvas.h
@@ -163,8 +163,6 @@ class Canvas : public skia::PlatformCanvas {
   // text is too big, it is truncated and '...' is added to the end.
   void DrawStringInt(const std::wstring& text, const gfx::Font& font,
                      const SkColor& color, int x, int y, int w, int h);
-  void DrawStringInt(const std::wstring& text, const gfx::Font& font,
-                     const SkColor& color, const gfx::Rect& display_rect);
 
   // Draws text with the specified color, font and location. The last argument
   // specifies flags for how the text should be rendered. It can be one of
diff --git a/app/gfx/skia_util.cc b/app/gfx/skia_util.cc
deleted file mode 100644
index ef5f843..0000000
--- a/app/gfx/skia_util.cc
+++ /dev/null
@@ -1,43 +0,0 @@
-// 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.
-
-#include "app/gfx/skia_util.h"
-
-#include "base/gfx/rect.h"
-#include "skia/ext/skia_utils.h"
-#include "third_party/skia/include/core/SkColorPriv.h"
-#include "third_party/skia/include/core/SkShader.h"
-#include "third_party/skia/include/effects/SkGradientShader.h"
-
-namespace gfx {
-
-SkRect RectToSkRect(const gfx::Rect& rect) {
-  SkRect r;
-  r.set(SkIntToScalar(rect.x()), SkIntToScalar(rect.y()),
-        SkIntToScalar(rect.right()), SkIntToScalar(rect.bottom()));
-  return r;
-}
-
-gfx::Rect SkRectToRect(const SkRect& rect) {
-  return gfx::Rect(SkScalarToFixed(rect.fLeft),
-                   SkScalarToFixed(rect.fTop),
-                   SkScalarToFixed(rect.width()),
-                   SkScalarToFixed(rect.height()));
-}
-
-SkShader* CreateGradientShader(int start_point,
-                               int end_point,
-                               SkColor start_color,
-                               SkColor end_color) {
-  SkColor grad_colors[2] = { start_color, end_color};
-  SkPoint grad_points[2];
-  grad_points[0].set(SkIntToScalar(0), SkIntToScalar(start_point));
-  grad_points[1].set(SkIntToScalar(0), SkIntToScalar(end_point));
-
-  return SkGradientShader::CreateLinear(
-      grad_points, grad_colors, NULL, 2, SkShader::kRepeat_TileMode);
-}
-
-}  // namespace gfx
-
diff --git a/app/gfx/skia_util.h b/app/gfx/skia_util.h
deleted file mode 100644
index 66a8aeb..0000000
--- a/app/gfx/skia_util.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// 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.
-
-#ifndef APP_GFX_SKIA_UTIL_H_
-#define APP_GFX_SKIA_UTIL_H_
-
-#include "third_party/skia/include/core/SkColor.h"
-#include "third_party/skia/include/core/SkRect.h"
-
-class SkShader;
-
-namespace gfx {
-
-class Rect;
-
-// Convert between Skia and gfx rect types.
-SkRect RectToSkRect(const gfx::Rect& rect);
-gfx::Rect SkRectToRect(const SkRect& rect);
-
-// Creates a vertical gradient shader. The caller owns the shader.
-// Example usage to avoid leaks:
-//   paint.setShader(gfx::CreateGradientShader(0, 10, red, blue))->safeUnref();
-//
-// (The old shader in the paint, if any, needs to be freed, and safeUnref will
-// handle the NULL case.)
-SkShader* CreateGradientShader(int start_point,
-                               int end_point,
-                               SkColor start_color,
-                               SkColor end_color);
-
-}  // namespace gfx;
-
-#endif  // APP_GFX_SKIA_UTIL_H_