| Index: ui/gfx/insets.h
|
| diff --git a/ui/gfx/insets.h b/ui/gfx/insets.h
|
| index a419059a55d3a526cbd6e11e29fa196e61c420cd..aa4b9eb5270fec10c8ad4ed3ed8296a4d9d70d4c 100644
|
| --- a/ui/gfx/insets.h
|
| +++ b/ui/gfx/insets.h
|
| @@ -1,52 +1,7 @@
|
| -// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| +// Copyright 2013 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 UI_GFX_INSETS_H_
|
| -#define UI_GFX_INSETS_H_
|
| +// TODO(beng): remove once callsites are patched.
|
| +#include "ui/gfx/geometry/insets.h"
|
|
|
| -#include <string>
|
| -
|
| -#include "build/build_config.h"
|
| -#include "ui/gfx/gfx_export.h"
|
| -#include "ui/gfx/insets_base.h"
|
| -
|
| -#if defined(TOOLKIT_GTK)
|
| -typedef struct _GtkBorder GtkBorder;
|
| -#endif
|
| -
|
| -namespace gfx {
|
| -
|
| -// An integer version of gfx::Insets.
|
| -class GFX_EXPORT Insets : public InsetsBase<Insets, int> {
|
| - public:
|
| - Insets();
|
| - Insets(int top, int left, int bottom, int right);
|
| -#if defined(TOOLKIT_GTK)
|
| - explicit Insets(const GtkBorder& border);
|
| -#endif
|
| -
|
| - ~Insets();
|
| -
|
| - Insets Scale(float scale) const {
|
| - return Scale(scale, scale);
|
| - }
|
| -
|
| - Insets Scale(float x_scale, float y_scale) const {
|
| - return Insets(static_cast<int>(top() * y_scale),
|
| - static_cast<int>(left() * x_scale),
|
| - static_cast<int>(bottom() * y_scale),
|
| - static_cast<int>(right() * x_scale));
|
| - }
|
| -
|
| - // Returns a string representation of the insets.
|
| - std::string ToString() const;
|
| -};
|
| -
|
| -#if !defined(COMPILER_MSVC)
|
| -extern template class InsetsBase<Insets, int>;
|
| -#endif
|
| -
|
| -} // namespace gfx
|
| -
|
| -#endif // UI_GFX_INSETS_H_
|
|
|