| 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/size.h" |
| 6 | 6 |
| 7 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
| 8 #include <windows.h> | 8 #include <windows.h> |
| 9 #elif defined(OS_MACOSX) | 9 #elif defined(OS_MACOSX) |
| 10 #include <CoreGraphics/CGGeometry.h> | 10 #include <ApplicationServices/ApplicationServices.h> |
| 11 #endif | 11 #endif |
| 12 | 12 |
| 13 #include "base/logging.h" | 13 #include "base/logging.h" |
| 14 #include "base/stringprintf.h" | 14 #include "base/stringprintf.h" |
| 15 #include "ui/gfx/size_base.h" | 15 #include "ui/gfx/size_base.h" |
| 16 #include "ui/gfx/size_base_impl.h" | 16 #include "ui/gfx/size_base_impl.h" |
| 17 | 17 |
| 18 namespace gfx { | 18 namespace gfx { |
| 19 | 19 |
| 20 template class SizeBase<Size, int>; | 20 template class SizeBase<Size, int>; |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 52 CGSize Size::ToCGSize() const { | 52 CGSize Size::ToCGSize() const { |
| 53 return CGSizeMake(width(), height()); | 53 return CGSizeMake(width(), height()); |
| 54 } | 54 } |
| 55 #endif | 55 #endif |
| 56 | 56 |
| 57 std::string Size::ToString() const { | 57 std::string Size::ToString() const { |
| 58 return base::StringPrintf("%dx%d", width(), height()); | 58 return base::StringPrintf("%dx%d", width(), height()); |
| 59 } | 59 } |
| 60 | 60 |
| 61 } // namespace gfx | 61 } // namespace gfx |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 10535059:
Remove -F…ApplicationServices.framework/Frameworks (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src/