OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "ui/gfx/size.h" | 5 #include "ui/gfx/geometry/size.h" |
6 | 6 |
7 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
8 #include <windows.h> | 8 #include <windows.h> |
9 #endif | 9 #endif |
10 | 10 |
11 #include "base/strings/stringprintf.h" | 11 #include "base/strings/stringprintf.h" |
12 | 12 |
13 namespace gfx { | 13 namespace gfx { |
14 | 14 |
15 template class SizeBase<Size, int>; | 15 template class SizeBase<Size, int>; |
(...skipping 21 matching lines...) Expand all Loading... |
37 CGSize Size::ToCGSize() const { | 37 CGSize Size::ToCGSize() const { |
38 return CGSizeMake(width(), height()); | 38 return CGSizeMake(width(), height()); |
39 } | 39 } |
40 #endif | 40 #endif |
41 | 41 |
42 std::string Size::ToString() const { | 42 std::string Size::ToString() const { |
43 return base::StringPrintf("%dx%d", width(), height()); | 43 return base::StringPrintf("%dx%d", width(), height()); |
44 } | 44 } |
45 | 45 |
46 } // namespace gfx | 46 } // namespace gfx |
OLD | NEW |