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

Unified Diff: chrome/browser/content_settings/permission_infobar_delegate.h

Issue 365123003: Implement midi permissions on top of the new common permission classes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Minor tweak to the push message infobar 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/content_settings/permission_infobar_delegate.h
diff --git a/chrome/browser/services/gcm/permission_infobar_delegate.h b/chrome/browser/content_settings/permission_infobar_delegate.h
similarity index 80%
rename from chrome/browser/services/gcm/permission_infobar_delegate.h
rename to chrome/browser/content_settings/permission_infobar_delegate.h
index 90b67bfa555fae946dc0472129d35fd2d3366c0b..41a88780ef9b05b54273ce3f6cc14c6343f4a3f0 100644
--- a/chrome/browser/services/gcm/permission_infobar_delegate.h
+++ b/chrome/browser/content_settings/permission_infobar_delegate.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_SERVICES_GCM_PERMISSION_INFOBAR_DELEGATE_H_
-#define CHROME_BROWSER_SERVICES_GCM_PERMISSION_INFOBAR_DELEGATE_H_
+#ifndef CHROME_BROWSER_CONTENT_SETTINGS_PERMISSION_INFOBAR_DELEGATE_H_
+#define CHROME_BROWSER_CONTENT_SETTINGS_PERMISSION_INFOBAR_DELEGATE_H_
#include "chrome/browser/content_settings/permission_request_id.h"
#include "chrome/browser/infobars/infobar_service.h"
@@ -13,9 +13,7 @@
class NavigationDetails;
class PermissionQueueController;
-namespace gcm {
-
-// Base class for permission infobars, it implements the default behaviour
+// Base class for permission infobars, it implements the default behavior
// so that the accept/deny buttons grant/deny the relevant permission.
// A basic implementor only needs to implement the methods that
// provide an icon and a message text to the infobar.
@@ -26,9 +24,11 @@ class PermissionInfobarDelegate : public ConfirmInfoBarDelegate {
protected:
PermissionInfobarDelegate(PermissionQueueController* controller,
const PermissionRequestID& id,
- const GURL& requesting_frame);
+ const GURL& requesting_origin);
// ConfirmInfoBarDelegate:
+ virtual base::string16 GetMessageText() const = 0;
+
virtual void InfoBarDismissed() OVERRIDE;
virtual infobars::InfoBarDelegate::Type GetInfoBarType() const OVERRIDE;
virtual base::string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
@@ -40,10 +40,9 @@ class PermissionInfobarDelegate : public ConfirmInfoBarDelegate {
PermissionQueueController* controller_; // not owned by us
const PermissionRequestID id_;
- GURL requesting_frame_;
+ GURL requesting_origin_;
DISALLOW_COPY_AND_ASSIGN(PermissionInfobarDelegate);
};
-} // namespace gcm
-#endif // CHROME_BROWSER_SERVICES_GCM_PERMISSION_INFOBAR_DELEGATE_H_
+#endif // CHROME_BROWSER_CONTENT_SETTINGS_PERMISSION_INFOBAR_DELEGATE_H_

Powered by Google App Engine
This is Rietveld 408576698