From 15c579aa7705e132e40299fade39f29e8eab903a Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Mon, 11 Jun 2012 20:38:42 +0000 Subject: [PATCH] Mac: Add support for cef_time_t.day_of_week (issue #629). git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@691 5089003a-bbd8-11dd-ad1f-f1f9622dbc98 --- cef1/include/internal/cef_time.h | 2 -- cef1/libcef/cef_time.cc | 4 ---- cef1/tests/unittests/cookie_unittest.cc | 4 ---- cef1/tests/unittests/v8_unittest.cc | 2 -- 4 files changed, 12 deletions(-) diff --git a/cef1/include/internal/cef_time.h b/cef1/include/internal/cef_time.h index 5d38cf7bc..ccaf19320 100644 --- a/cef1/include/internal/cef_time.h +++ b/cef1/include/internal/cef_time.h @@ -44,9 +44,7 @@ extern "C" { typedef struct _cef_time_t { int year; // Four digit year "2007" int month; // 1-based month (values 1 = January, etc.) -#if !defined(OS_MACOSX) int day_of_week; // 0-based day of week (0 = Sunday, etc.) -#endif int day_of_month; // 1-based day of month (1-31) int hour; // Hour within the current day (0-23) int minute; // Minute within the current hour (0-59) diff --git a/cef1/libcef/cef_time.cc b/cef1/libcef/cef_time.cc index 7fef1bda3..cc28c8dcd 100644 --- a/cef1/libcef/cef_time.cc +++ b/cef1/libcef/cef_time.cc @@ -8,9 +8,7 @@ void cef_time_to_basetime(const cef_time_t& cef_time, base::Time& time) { base::Time::Exploded exploded; exploded.year = cef_time.year; exploded.month = cef_time.month; -#if !defined(OS_MACOSX) exploded.day_of_week = cef_time.day_of_week; -#endif exploded.day_of_month = cef_time.day_of_month; exploded.hour = cef_time.hour; exploded.minute = cef_time.minute; @@ -24,9 +22,7 @@ void cef_time_from_basetime(const base::Time& time, cef_time_t& cef_time) { time.UTCExplode(&exploded); cef_time.year = exploded.year; cef_time.month = exploded.month; -#if !defined(OS_MACOSX) cef_time.day_of_week = exploded.day_of_week; -#endif cef_time.day_of_month = exploded.day_of_month; cef_time.hour = exploded.hour; cef_time.minute = exploded.minute; diff --git a/cef1/tests/unittests/cookie_unittest.cc b/cef1/tests/unittests/cookie_unittest.cc index b2c7644e9..53ff58bd1 100644 --- a/cef1/tests/unittests/cookie_unittest.cc +++ b/cef1/tests/unittests/cookie_unittest.cc @@ -94,9 +94,7 @@ void CreateCookie(CefRefPtr manager, cookie.has_expires = true; cookie.expires.year = 2200; cookie.expires.month = 4; -#if !defined(OS_MACOSX) cookie.expires.day_of_week = 5; -#endif cookie.expires.day_of_month = 11; CookieVector cookies; @@ -131,9 +129,7 @@ void GetCookie(CefRefPtr manager, EXPECT_TRUE(cookie_read.has_expires); EXPECT_EQ(cookie.expires.year, cookie_read.expires.year); EXPECT_EQ(cookie.expires.month, cookie_read.expires.month); -#if !defined(OS_MACOSX) EXPECT_EQ(cookie.expires.day_of_week, cookie_read.expires.day_of_week); -#endif EXPECT_EQ(cookie.expires.day_of_month, cookie_read.expires.day_of_month); EXPECT_EQ(cookie.expires.hour, cookie_read.expires.hour); EXPECT_EQ(cookie.expires.minute, cookie_read.expires.minute); diff --git a/cef1/tests/unittests/v8_unittest.cc b/cef1/tests/unittests/v8_unittest.cc index 9437e84f2..2ae369877 100644 --- a/cef1/tests/unittests/v8_unittest.cc +++ b/cef1/tests/unittests/v8_unittest.cc @@ -292,9 +292,7 @@ class V8TestHandler : public TestHandler { CefTime date; date.year = 2200; date.month = 4; -#if !defined(OS_MACOSX) date.day_of_week = 5; -#endif date.day_of_month = 11; date.hour = 20; date.minute = 15;