Index: chrome/browser/notifications/desktop_notification_service.cc |
diff --git a/chrome/browser/notifications/desktop_notification_service.cc b/chrome/browser/notifications/desktop_notification_service.cc |
index 9ff4d4509b5eb5ed52cad2eb9e0c77cb30e2d140..5c21338afc5d491fd63957ea84edb6a433dd644f 100644 |
--- a/chrome/browser/notifications/desktop_notification_service.cc |
+++ b/chrome/browser/notifications/desktop_notification_service.cc |
@@ -58,8 +58,8 @@ using content::BrowserThread; |
using content::RenderViewHost; |
using content::WebContents; |
using message_center::NotifierId; |
-using WebKit::WebNotificationPresenter; |
-using WebKit::WebTextDirection; |
+using blink::WebNotificationPresenter; |
+using blink::WebTextDirection; |
// NotificationPermissionInfoBarDelegate -------------------------------------- |
@@ -226,7 +226,7 @@ string16 DesktopNotificationService::CreateDataUrl( |
subst.push_back(net::EscapeForHTML(UTF16ToUTF8(title))); |
subst.push_back(net::EscapeForHTML(UTF16ToUTF8(body))); |
// icon float position |
- subst.push_back(dir == WebKit::WebTextDirectionRightToLeft ? |
+ subst.push_back(dir == blink::WebTextDirectionRightToLeft ? |
"right" : "left"); |
} else if (title.empty() || body.empty()) { |
resource = IDR_NOTIFICATION_1LINE_HTML; |
@@ -242,7 +242,7 @@ string16 DesktopNotificationService::CreateDataUrl( |
subst.push_back(net::EscapeForHTML(UTF16ToUTF8(body))); |
} |
// body text direction |
- subst.push_back(dir == WebKit::WebTextDirectionRightToLeft ? |
+ subst.push_back(dir == blink::WebTextDirectionRightToLeft ? |
"rtl" : "ltr"); |
return CreateDataUrl(resource, subst); |
@@ -277,7 +277,7 @@ std::string DesktopNotificationService::AddNotification( |
if (message_center::IsRichNotificationEnabled()) { |
// For message center create a non-HTML notification with |icon_url|. |
Notification notification(origin_url, icon_url, title, message, |
- WebKit::WebTextDirectionDefault, |
+ blink::WebTextDirectionDefault, |
string16(), replace_id, delegate); |
g_browser_process->notification_ui_manager()->Add(notification, profile); |
return notification.notification_id(); |
@@ -285,7 +285,7 @@ std::string DesktopNotificationService::AddNotification( |
// Generate a data URL embedding the icon URL, title, and message. |
GURL content_url(CreateDataUrl( |
- icon_url, title, message, WebKit::WebTextDirectionDefault)); |
+ icon_url, title, message, blink::WebTextDirectionDefault)); |
Notification notification( |
GURL(), content_url, string16(), replace_id, delegate); |
g_browser_process->notification_ui_manager()->Add(notification, profile); |
@@ -304,7 +304,7 @@ std::string DesktopNotificationService::AddIconNotification( |
if (message_center::IsRichNotificationEnabled()) { |
// For message center create a non-HTML notification with |icon|. |
Notification notification(origin_url, icon, title, message, |
- WebKit::WebTextDirectionDefault, |
+ blink::WebTextDirectionDefault, |
string16(), replace_id, delegate); |
g_browser_process->notification_ui_manager()->Add(notification, profile); |
return notification.notification_id(); |
@@ -650,7 +650,7 @@ void DesktopNotificationService::OnStringListPrefChanged( |
} |
} |
-WebKit::WebNotificationPresenter::Permission |
+blink::WebNotificationPresenter::Permission |
DesktopNotificationService::HasPermission(const GURL& origin) { |
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
HostContentSettingsMap* host_content_settings_map = |
@@ -662,13 +662,13 @@ WebKit::WebNotificationPresenter::Permission |
NO_RESOURCE_IDENTIFIER); |
if (setting == CONTENT_SETTING_ALLOW) |
- return WebKit::WebNotificationPresenter::PermissionAllowed; |
+ return blink::WebNotificationPresenter::PermissionAllowed; |
if (setting == CONTENT_SETTING_BLOCK) |
- return WebKit::WebNotificationPresenter::PermissionDenied; |
+ return blink::WebNotificationPresenter::PermissionDenied; |
if (setting == CONTENT_SETTING_ASK) |
- return WebKit::WebNotificationPresenter::PermissionNotAllowed; |
+ return blink::WebNotificationPresenter::PermissionNotAllowed; |
NOTREACHED() << "Invalid notifications settings value: " << setting; |
- return WebKit::WebNotificationPresenter::PermissionNotAllowed; |
+ return blink::WebNotificationPresenter::PermissionNotAllowed; |
} |
void DesktopNotificationService::Observe( |