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

Unified Diff: chrome/browser/chrome_content_browser_client.cc

Issue 398163008: Export content_common dependency from some content targets. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add content::NotificationPresenterPermission enum Created 6 years, 5 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index b0716a9223a25765c9b01a3776aa044f482cb491..279dd08a73e02e31bd8bc0d28a7a01dda78a0e44 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -2137,7 +2137,7 @@ void ChromeContentBrowserClient::RequestDesktopNotificationPermission(
#endif
}
-blink::WebNotificationPresenter::Permission
+content::NotificationPresenterPermission
ChromeContentBrowserClient::CheckDesktopNotificationPermission(
const GURL& source_origin,
content::ResourceContext* context,
@@ -2159,7 +2159,7 @@ blink::WebNotificationPresenter::Permission
iter != extensions.end(); ++iter) {
// Then, check to see if it's been disabled by the user.
if (!extension_info_map->AreNotificationsDisabled((*iter)->id()))
- return blink::WebNotificationPresenter::PermissionAllowed;
+ return content::NOTIFICATION_PRESENTER_PERMISSION_ALLOWED;
}
// No enabled extensions exist, so check the normal host content settings.
@@ -2172,12 +2172,12 @@ blink::WebNotificationPresenter::Permission
NO_RESOURCE_IDENTIFIER);
if (setting == CONTENT_SETTING_ALLOW)
- return blink::WebNotificationPresenter::PermissionAllowed;
+ return content::NOTIFICATION_PRESENTER_PERMISSION_ALLOWED;
if (setting == CONTENT_SETTING_BLOCK)
- return blink::WebNotificationPresenter::PermissionDenied;
- return blink::WebNotificationPresenter::PermissionNotAllowed;
+ return content::NOTIFICATION_PRESENTER_PERMISSION_DENIED;
+ return content::NOTIFICATION_PRESENTER_PERMISSION_NOT_ALLOWED;
#else
- return blink::WebNotificationPresenter::PermissionAllowed;
+ return content::NOTIFICATION_PRESENTER_PERMISSION_ALLOWED;
#endif
}
« no previous file with comments | « chrome/browser/chrome_content_browser_client.h ('k') | content/browser/renderer_host/render_message_filter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698