Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(914)

Unified Diff: ui/gfx/insets.h

Issue 109433013: Move geometric types to a separate, more lightweight target. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« ui/aura/aura.gyp ('K') | « ui/gfx/gfx.gyp ('k') | ui/gfx/insets.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_
« ui/aura/aura.gyp ('K') | « ui/gfx/gfx.gyp ('k') | ui/gfx/insets.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698