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

Side by Side Diff: ui/gfx/size.cc

Issue 10837041: Initial iOS bring up of ui. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Stuart feedback. Created 8 years, 4 months 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 unified diff | Download patch
« no previous file with comments | « ui/gfx/size.h ('k') | ui/ui.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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)
10 #include <ApplicationServices/ApplicationServices.h>
11 #endif 9 #endif
12 10
13 #include "base/logging.h" 11 #include "base/logging.h"
14 #include "base/stringprintf.h" 12 #include "base/stringprintf.h"
15 #include "ui/gfx/size_base.h" 13 #include "ui/gfx/size_base.h"
16 #include "ui/gfx/size_base_impl.h" 14 #include "ui/gfx/size_base_impl.h"
17 15
18 namespace gfx { 16 namespace gfx {
19 17
20 template class SizeBase<Size, int>; 18 template class SizeBase<Size, int>;
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 CGSize Size::ToCGSize() const { 50 CGSize Size::ToCGSize() const {
53 return CGSizeMake(width(), height()); 51 return CGSizeMake(width(), height());
54 } 52 }
55 #endif 53 #endif
56 54
57 std::string Size::ToString() const { 55 std::string Size::ToString() const {
58 return base::StringPrintf("%dx%d", width(), height()); 56 return base::StringPrintf("%dx%d", width(), height());
59 } 57 }
60 58
61 } // namespace gfx 59 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/gfx/size.h ('k') | ui/ui.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698