summaryrefslogtreecommitdiffstats
path: root/content/public
diff options
context:
space:
mode:
authormiguelg@chromium.org <miguelg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-25 17:44:45 +0000
committermiguelg@chromium.org <miguelg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-25 17:44:45 +0000
commitff3fb69d0827fad0a9c3092711f0f107bddf444c (patch)
treeb384ea62a58622546ed2e1bd9f78d83cb79d2940 /content/public
parentdfe07c3330bb0031fb12b3411ae4860d2318ee43 (diff)
downloadchromium_src-ff3fb69d0827fad0a9c3092711f0f107bddf444c.zip
chromium_src-ff3fb69d0827fad0a9c3092711f0f107bddf444c.tar.gz
chromium_src-ff3fb69d0827fad0a9c3092711f0f107bddf444c.tar.bz2
Manual revert with a fix for the failing test.
Revert 279437 "Implement a permission check for push." Suspect this is cause of test failure: http://build.chromium.org/p/chromium.mac/builders/Mac%2010.6%20Tests%20%28dbg%29%283%29/builds/50906/steps/browser_tests/logs/Init > Implement a permission check for push. > > Extracted common functionality from the midi permission check. > A subsequent CL will move the common classes to chrome/browser/content_settings/ > and implement the midi permission check in terms of these classes. > > Note that bubbles are not yet implemented so only infobars work now. > Note also that only way to rever the permission decision right now > is to clear browser settings. > > Review URL: https://codereview.chromium.org/343743004 BUG=350378 TBR=bauerb,jam,fgorski,mvanouwerker Review URL: https://codereview.chromium.org/352063003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@279753 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/public')
-rw-r--r--content/public/browser/push_messaging_service.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/content/public/browser/push_messaging_service.h b/content/public/browser/push_messaging_service.h
index 37150db..560d005 100644
--- a/content/public/browser/push_messaging_service.h
+++ b/content/public/browser/push_messaging_service.h
@@ -25,6 +25,8 @@ class CONTENT_EXPORT PushMessagingService {
virtual ~PushMessagingService() {}
virtual void Register(const std::string& app_id,
const std::string& sender_id,
+ int renderer_id,
+ int render_view_id,
const RegisterCallback& callback) = 0;
};