Move src/gfx/ to src/ui/gfx

To reduce the size of this change I've left stub header files in src/gfx/. Once all includes have been updated I'll delete the stub files.

BUG=71063
TEST=Still doing test builds.

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

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

1 files changed, 2 insertions, 68 deletions

diff --git a/gfx/platform_font.h b/gfx/platform_font.h
index 412e260..2a88fff 100644
--- a/gfx/platform_font.h
+++ b/gfx/platform_font.h
@@ -6,74 +6,8 @@
 #define GFX_PLATFORM_FONT_
 #pragma once
 
-#include <string>
-
-#include "base/ref_counted.h"
-#include "base/string16.h"
-#include "gfx/native_widget_types.h"
-
-namespace gfx {
-
-class Font;
-
-class PlatformFont : public base::RefCounted<PlatformFont> {
- public:
-  // Create an appropriate PlatformFont implementation.
-  static PlatformFont* CreateDefault();
-  static PlatformFont* CreateFromFont(const Font& other);
-  static PlatformFont* CreateFromNativeFont(NativeFont native_font);
-  static PlatformFont* CreateFromNameAndSize(const string16& font_name,
-                                             int font_size);
-
-  // Returns a new Font derived from the existing font.
-  // size_delta is the size to add to the current font. See the single
-  // argument version of this method for an example.
-  // The style parameter specifies the new style for the font, and is a
-  // bitmask of the values: BOLD, ITALIC and UNDERLINED.
-  virtual Font DeriveFont(int size_delta, int style) const = 0;
-
-  // Returns the number of vertical pixels needed to display characters from
-  // the specified font.  This may include some leading, i.e. height may be
-  // greater than just ascent + descent.  Specifically, the Windows and Mac
-  // implementations include leading and the Linux one does not.  This may
-  // need to be revisited in the future.
-  virtual int GetHeight() const = 0;
-
-  // Returns the baseline, or ascent, of the font.
-  virtual int GetBaseline() const = 0;
-
-  // Returns the average character width for the font.
-  virtual int GetAverageCharacterWidth() const = 0;
-
-  // Returns the number of horizontal pixels needed to display the specified
-  // string.
-  virtual int GetStringWidth(const string16& text) const = 0;
-
-  // Returns the expected number of horizontal pixels needed to display the
-  // specified length of characters. Call GetStringWidth() to retrieve the
-  // actual number.
-  virtual int GetExpectedTextWidth(int length) const = 0;
-
-  // Returns the style of the font.
-  virtual int GetStyle() const = 0;
-
-  // Returns the font name.
-  virtual string16 GetFontName() const = 0;
-
-  // Returns the font size in pixels.
-  virtual int GetFontSize() const = 0;
-
-  // Returns the native font handle.
-  virtual NativeFont GetNativeFont() const = 0;
-
- protected:
-  virtual ~PlatformFont() {}
-
- private:
-  friend class base::RefCounted<PlatformFont>;
-};
-
-}  // namespace gfx
+#include "ui/gfx/platform_font.h"
+// TODO(sail): remove this file once all includes have been updated.
 
 #endif  // GFX_PLATFORM_FONT_