Reverted 29253.

TBR: nick@chromium.org

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

3 files changed, 3 insertions, 73 deletions

diff --git a/app/app.gyp b/app/app.gyp
index 329eb04..c7ef0c7 100644
--- a/app/app.gyp
+++ b/app/app.gyp
@@ -92,16 +92,14 @@
         'gfx/codec/jpeg_codec.h',
         'gfx/codec/png_codec.cc',
         'gfx/codec/png_codec.h',
-        'gfx/color_utils.cc',
-        'gfx/color_utils.h',
-        'gfx/favicon_size.h',
         'gfx/font.h',
         'gfx/font_gtk.cc',
         'gfx/font_mac.mm',
         'gfx/font_skia.cc',
-        'gfx/font_util.h',
-        'gfx/font_util.cc',
         'gfx/font_win.cc',
+        'gfx/color_utils.cc',
+        'gfx/color_utils.h',
+        'gfx/favicon_size.h',
         'gfx/gdi_util.cc',
         'gfx/gdi_util.h',
         'gfx/gtk_util.cc',
diff --git a/app/gfx/font_util.cc b/app/gfx/font_util.cc
deleted file mode 100644
index 278677c..0000000
--- a/app/gfx/font_util.cc
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) 2009 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/font_util.h"
-
-#include "app/gfx/font.h"
-#include "app/l10n_util.h"
-#include "base/logging.h"
-
-namespace gfx {
-
-int GetLocalizedContentsWidthForFont(int col_resource_id,
-                                     const gfx::Font& font) {
-  double chars = 0;
-  StringToDouble(WideToUTF8(l10n_util::GetString(col_resource_id)), &chars);
-  int width = font.GetExpectedTextWidth(static_cast<int>(chars));
-  DCHECK(width > 0);
-  return width;
-}
-
-int GetLocalizedContentsHeightForFont(int row_resource_id,
-                                      const gfx::Font& font) {
-  double lines = 0;
-  StringToDouble(WideToUTF8(l10n_util::GetString(row_resource_id)), &lines);
-  int height = static_cast<int>(font.height() * lines);
-  DCHECK(height > 0);
-  return height;
-}
-
-gfx::Size GetLocalizedContentsSizeForFont(int col_resource_id,
-                                          int row_resource_id,
-                                          const gfx::Font& font) {
-  return gfx::Size(GetLocalizedContentsWidthForFont(col_resource_id, font),
-                   GetLocalizedContentsHeightForFont(row_resource_id, font));
-}
-
-}  // namespace gfx
-
diff --git a/app/gfx/font_util.h b/app/gfx/font_util.h
deleted file mode 100644
index 36bc693..0000000
--- a/app/gfx/font_util.h
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) 2006-2009 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_FONT_UTIL_H_
-#define APP_GFX_FONT_UTIL_H_
-
-#include "base/gfx/size.h"
-
-namespace gfx {
-
-class Font;
-
-// Returns the preferred size of the contents view of a window based on
-// its localized size data and the given font. The width in cols is held in a
-// localized string resource identified by |col_resource_id|, the height in the
-// same fashion.
-int GetLocalizedContentsWidthForFont(int col_resource_id,
-                                     const gfx::Font& font);
-int GetLocalizedContentsHeightForFont(int row_resource_id,
-                                      const gfx::Font& font);
-gfx::Size GetLocalizedContentsSizeForFont(int col_resource_id,
-                                          int row_resource_id,
-                                          const gfx::Font& font);
-
-}  // namespace gfx
-
-#endif  // APP_GFX_FONT_UTIL_H_
-