content/child/notifications/notification_data_conversions.cc - Issue 1083683003: Speculative revert by sheriff

Side by Side Diff: content/child/notifications/notification_data_conversions.cc

Issue 1083683003: Speculative revert by sheriff (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Removed an unrelated commit that had accidentally slipped in. Created 5 years, 8 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 | « content/browser/notifications/notification_database_data_unittest.cc ('k') | content/child/notifications/notification_data_conversions_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 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 "content/child/notifications/notification_data_conversions.h"	5 #include "content/child/notifications/notification_data_conversions.h"

6	6

7 #include "base/strings/utf_string_conversions.h"	7 #include "base/strings/utf_string_conversions.h"

8 #include "third_party/WebKit/public/platform/WebString.h"	8 #include "third_party/WebKit/public/platform/WebString.h"

9 #include "third_party/WebKit/public/platform/WebURL.h"	9 #include "third_party/WebKit/public/platform/WebURL.h"

10	10

11 using blink::WebNotificationData;	11 using blink::WebNotificationData;

12	12

13 namespace content {	13 namespace content {

14	14

15 PlatformNotificationData ToPlatformNotificationData(	15 PlatformNotificationData ToPlatformNotificationData(

16 const WebNotificationData& web_data) {	16 const WebNotificationData& web_data) {

17 PlatformNotificationData platform_data;	17 PlatformNotificationData platform_data;

18 platform_data.title = web_data.title;	18 platform_data.title = web_data.title;

19 platform_data.direction =	19 platform_data.direction =

20 web_data.direction == WebNotificationData::DirectionLeftToRight	20 web_data.direction == WebNotificationData::DirectionLeftToRight

21 ? PlatformNotificationData::NotificationDirectionLeftToRight	21 ? PlatformNotificationData::NotificationDirectionLeftToRight

22 : PlatformNotificationData::NotificationDirectionRightToLeft;	22 : PlatformNotificationData::NotificationDirectionRightToLeft;

23 platform_data.lang = base::UTF16ToUTF8(web_data.lang);	23 platform_data.lang = base::UTF16ToUTF8(web_data.lang);

24 platform_data.body = web_data.body;	24 platform_data.body = web_data.body;

25 platform_data.tag = base::UTF16ToUTF8(web_data.tag);	25 platform_data.tag = base::UTF16ToUTF8(web_data.tag);

26 platform_data.icon = GURL(web_data.icon.string());	26 platform_data.icon = GURL(web_data.icon.string());

27 platform_data.silent = web_data.silent;	27 platform_data.silent = web_data.silent;

28 platform_data.data.assign(web_data.data.begin(), web_data.data.end());

29	28

30 return platform_data;	29 return platform_data;

31 }	30 }

32	31

33 WebNotificationData ToWebNotificationData(	32 WebNotificationData ToWebNotificationData(

34 const PlatformNotificationData& platform_data) {	33 const PlatformNotificationData& platform_data) {

35 WebNotificationData web_data;	34 WebNotificationData web_data;

36 web_data.title = platform_data.title;	35 web_data.title = platform_data.title;

37 web_data.direction =	36 web_data.direction =

38 platform_data.direction ==	37 platform_data.direction ==

39 PlatformNotificationData::NotificationDirectionLeftToRight	38 PlatformNotificationData::NotificationDirectionLeftToRight

40 ? WebNotificationData::DirectionLeftToRight	39 ? WebNotificationData::DirectionLeftToRight

41 : WebNotificationData::DirectionRightToLeft;	40 : WebNotificationData::DirectionRightToLeft;

42 web_data.lang = blink::WebString::fromUTF8(platform_data.lang);	41 web_data.lang = blink::WebString::fromUTF8(platform_data.lang);

43 web_data.body = platform_data.body;	42 web_data.body = platform_data.body;

44 web_data.tag = blink::WebString::fromUTF8(platform_data.tag);	43 web_data.tag = blink::WebString::fromUTF8(platform_data.tag);

45 web_data.icon = blink::WebURL(platform_data.icon);	44 web_data.icon = blink::WebURL(platform_data.icon);

46 web_data.silent = platform_data.silent;	45 web_data.silent = platform_data.silent;

47 web_data.data = platform_data.data;

48	46

49 return web_data;	47 return web_data;

50 }	48 }

51	49

52 } // namespace content	50 } // namespace content

OLD	NEW