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

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

Issue 1259673002: Make UTF16ToASCII and UTF16TOUTF8 take a StringPiece (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 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(base::StringPiece16(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(base::StringPiece16(web_data.tag));
26 platform_data.icon = GURL(web_data.icon.string()); 26 platform_data.icon = GURL(web_data.icon.string());
27 platform_data.vibration_pattern.assign(web_data.vibrate.begin(), 27 platform_data.vibration_pattern.assign(web_data.vibrate.begin(),
28 web_data.vibrate.end()); 28 web_data.vibrate.end());
29 platform_data.silent = web_data.silent; 29 platform_data.silent = web_data.silent;
30 platform_data.data.assign(web_data.data.begin(), web_data.data.end()); 30 platform_data.data.assign(web_data.data.begin(), web_data.data.end());
31 31
32 return platform_data; 32 return platform_data;
33 } 33 }
34 34
35 WebNotificationData ToWebNotificationData( 35 WebNotificationData ToWebNotificationData(
(...skipping 10 matching lines...) Expand all
46 web_data.tag = blink::WebString::fromUTF8(platform_data.tag); 46 web_data.tag = blink::WebString::fromUTF8(platform_data.tag);
47 web_data.icon = blink::WebURL(platform_data.icon); 47 web_data.icon = blink::WebURL(platform_data.icon);
48 web_data.vibrate = platform_data.vibration_pattern; 48 web_data.vibrate = platform_data.vibration_pattern;
49 web_data.silent = platform_data.silent; 49 web_data.silent = platform_data.silent;
50 web_data.data = platform_data.data; 50 web_data.data = platform_data.data;
51 51
52 return web_data; 52 return web_data;
53 } 53 }
54 54
55 } // namespace content 55 } // namespace content
OLDNEW
« no previous file with comments | « content/child/browser_font_resource_trusted.cc ('k') | content/child/notifications/notification_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698