Cleanup old NotificationProvider::grantPermission overload.

BUG=94399 TEST=chrome, DumpRenderTree, and test_shell compile. Review URL: http://codereview.chromium.org/8492002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108921 0039d316-1c4b-4281-b951-d872f2087c98
excellent-media · Nov 7, 2011 · c7df61b · c7df61b
1 parent 562b8d2
commit c7df61b
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 26 deletions.
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
@@ -789,10 +789,8 @@ WebKit::WebNotificationPresenter::Permission
 
   // Fall back to the regular notification preferences, which works on an
   // origin basis.
-  // TODO(dcheng): Change to just source_origin once WebKit side is cleaned up.
   return io_data->GetNotificationService() ?
-      io_data->GetNotificationService()->HasPermission(
-          source_origin.GetOrigin()) :
+      io_data->GetNotificationService()->HasPermission(source_origin) :
       WebKit::WebNotificationPresenter::PermissionNotAllowed;
 }
 

diff --git a/content/renderer/notification_provider.cc b/content/renderer/notification_provider.cc
@@ -66,16 +66,6 @@ WebNotificationPresenter::Permission NotificationProvider::checkPermission(
   return static_cast<WebNotificationPresenter::Permission>(permission);
 }
 
-WebNotificationPresenter::Permission NotificationProvider::checkPermission(
-    const WebURL& origin) {
-  int permission;
-  Send(new DesktopNotificationHostMsg_CheckPermission(
-          routing_id(),
-          origin,
-          &permission));
-  return static_cast<WebNotificationPresenter::Permission>(permission);
-}
-
 void NotificationProvider::requestPermission(
     const WebSecurityOrigin& origin,
     WebNotificationPermissionCallback* callback) {

diff --git a/content/renderer/notification_provider.h b/content/renderer/notification_provider.h
@@ -35,9 +35,6 @@ class NotificationProvider : public content::RenderViewObserver,
   virtual void objectDestroyed(const WebKit::WebNotification& proxy);
   virtual WebKit::WebNotificationPresenter::Permission checkPermission(
       const WebKit::WebSecurityOrigin& origin);
-  // Deprecated, and will be removed after the WebKit roll.
-  virtual WebKit::WebNotificationPresenter::Permission checkPermission(
-      const WebKit::WebURL& origin);
   virtual void requestPermission(const WebKit::WebSecurityOrigin& origin,
       WebKit::WebNotificationPermissionCallback* callback);
 

diff --git a/webkit/tools/test_shell/notification_presenter.cc b/webkit/tools/test_shell/notification_presenter.cc
@@ -104,15 +104,6 @@ WebNotificationPresenter::Permission TestNotificationPresenter::checkPermission(
                  : WebNotificationPresenter::PermissionDenied;
 }
 
-WebNotificationPresenter::Permission TestNotificationPresenter::checkPermission(
-    const WebURL& url) {
-  // Check with the layout test controller
-  std::string origin = static_cast<GURL>(url).GetOrigin().spec();
-  bool allowed = allowed_origins_.find(origin) != allowed_origins_.end();
-  return allowed ? WebNotificationPresenter::PermissionAllowed
-                 : WebNotificationPresenter::PermissionDenied;
-}
-
 void TestNotificationPresenter::requestPermission(
     const WebSecurityOrigin& origin,
     WebNotificationPermissionCallback* callback) {

diff --git a/webkit/tools/test_shell/notification_presenter.h b/webkit/tools/test_shell/notification_presenter.h
@@ -29,7 +29,6 @@ class TestNotificationPresenter : public WebKit::WebNotificationPresenter {
   virtual void cancel(const WebKit::WebNotification&);
   virtual void objectDestroyed(const WebKit::WebNotification&);
   virtual Permission checkPermission(const WebKit::WebSecurityOrigin& origin);
-  virtual Permission checkPermission(const WebKit::WebURL& url);
   virtual void requestPermission(const WebKit::WebSecurityOrigin& origin,
       WebKit::WebNotificationPermissionCallback* callback);