summaryrefslogtreecommitdiffstats
path: root/base/gfx
diff options
context:
space:
mode:
authorkkania@chromium.org <kkania@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-19 01:27:51 +0000
committerkkania@chromium.org <kkania@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-19 01:27:51 +0000
commit73333786fdb1f3b9fb5b4a8d2afda653b0e648c2 (patch)
treeaaede316d84f6264dc705b1577031895fa065941 /base/gfx
parent098267f02562f5636c4e7dd6fc4c52175862cf94 (diff)
downloadchromium_src-73333786fdb1f3b9fb5b4a8d2afda653b0e648c2.zip
chromium_src-73333786fdb1f3b9fb5b4a8d2afda653b0e648c2.tar.gz
chromium_src-73333786fdb1f3b9fb5b4a8d2afda653b0e648c2.tar.bz2
[Mac] Port browser action popup test to mac.
BUG=29710 TEST=none Review URL: http://codereview.chromium.org/506069 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35020 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/gfx')
-rw-r--r--base/gfx/size.cc13
-rw-r--r--base/gfx/size.h7
2 files changed, 20 insertions, 0 deletions
diff --git a/base/gfx/size.cc b/base/gfx/size.cc
index 76dc023..91f39c0 100644
--- a/base/gfx/size.cc
+++ b/base/gfx/size.cc
@@ -21,6 +21,19 @@ Size::Size(int width, int height) {
set_height(height);
}
+#if defined(OS_MACOSX)
+Size::Size(const CGSize& s) {
+ set_width(s.width);
+ set_height(s.height);
+}
+
+Size& Size::operator=(const CGSize& s) {
+ set_width(s.width);
+ set_height(s.height);
+ return *this;
+}
+#endif
+
#if defined(OS_WIN)
SIZE Size::ToSIZE() const {
SIZE s;
diff --git a/base/gfx/size.h b/base/gfx/size.h
index 3e74e80..896908e8 100644
--- a/base/gfx/size.h
+++ b/base/gfx/size.h
@@ -24,9 +24,16 @@ class Size {
public:
Size() : width_(0), height_(0) {}
Size(int width, int height);
+#if defined(OS_MACOSX)
+ explicit Size(const CGSize& s);
+#endif
~Size() {}
+#if defined(OS_MACOSX)
+ Size& operator=(const CGSize& s);
+#endif
+
int width() const { return width_; }
int height() const { return height_; }