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

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

Issue 10837041: Initial iOS bring up of ui. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Possible alternative. 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
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 #ifndef UI_GFX_SIZE_H_ 5 #ifndef UI_GFX_SIZE_H_
6 #define UI_GFX_SIZE_H_ 6 #define UI_GFX_SIZE_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "build/build_config.h" 10 #include "build/build_config.h"
11 #include "ui/base/ui_export.h" 11 #include "ui/base/ui_export.h"
12 #include "ui/gfx/size_base.h" 12 #include "ui/gfx/size_base.h"
13 13
14 #if defined(OS_WIN) 14 #if defined(OS_WIN)
15 typedef struct tagSIZE SIZE; 15 typedef struct tagSIZE SIZE;
16 #elif defined(OS_MACOSX) 16 #elif defined(OS_IOS) // iOS but not Mac
17 #include <CoreGraphics/CoreGraphics.h>
18 #elif defined(OS_MACOSX) // iOS special-cased above
stuartmorgan 2012/08/01 13:26:18 Remove comments
noyau (Ping after 24h) 2012/08/01 13:53:45 Done.
17 #include <ApplicationServices/ApplicationServices.h> 19 #include <ApplicationServices/ApplicationServices.h>
18 #endif 20 #endif
19 21
20 namespace gfx { 22 namespace gfx {
21 23
22 // A size has width and height values. 24 // A size has width and height values.
23 class UI_EXPORT Size : public SizeBase<Size, int> { 25 class UI_EXPORT Size : public SizeBase<Size, int> {
24 public: 26 public:
25 Size(); 27 Size();
26 Size(int width, int height); 28 Size(int width, int height);
(...skipping 16 matching lines...) Expand all
43 std::string ToString() const; 45 std::string ToString() const;
44 }; 46 };
45 47
46 #if !defined(COMPILER_MSVC) 48 #if !defined(COMPILER_MSVC)
47 extern template class SizeBase<Size, int>; 49 extern template class SizeBase<Size, int>;
48 #endif 50 #endif
49 51
50 } // namespace gfx 52 } // namespace gfx
51 53
52 #endif // UI_GFX_SIZE_H_ 54 #endif // UI_GFX_SIZE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698