Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / media / protected_media_identifier_infobar_delegate.h

diff --git a/src/chrome/browser/media/protected_media_identifier_infobar_delegate.h b/src/chrome/browser/media/protected_media_identifier_infobar_delegate.h
index 03f02eb..7c05e58 100644 (file)
--- a/src/chrome/browser/media/protected_media_identifier_infobar_delegate.h
+++ b/src/chrome/browser/media/protected_media_identifier_infobar_delegate.h
@@ -7,8 +7,8 @@
 
 #include <string>
 
-#include "chrome/browser/content_settings/permission_request_id.h"
-#include "chrome/browser/infobars/confirm_infobar_delegate.h"
+#include "components/content_settings/core/common/permission_request_id.h"
+#include "components/infobars/core/confirm_infobar_delegate.h"
 #include "url/gurl.h"
 
 class PermissionQueueController;
@@ -22,11 +22,12 @@ class ProtectedMediaIdentifierInfoBarDelegate : public ConfirmInfoBarDelegate {
   // Creates a protected media identifier infobar and delegate and adds the
   // infobar to |infobar_service|.  Returns the infobar if it was successfully
   // added.
-  static InfoBar* Create(InfoBarService* infobar_service,
-                         PermissionQueueController* controller,
-                         const PermissionRequestID& id,
-                         const GURL& requesting_frame,
-                         const std::string& display_languages);
+  static infobars::InfoBar* Create(InfoBarService* infobar_service,
+                                   PermissionQueueController* controller,
+                                   const PermissionRequestID& id,
+                                   const GURL& requesting_frame,
+                                   const std::string& display_languages);
+
  protected:
   ProtectedMediaIdentifierInfoBarDelegate(PermissionQueueController* controller,
                                           const PermissionRequestID& id,
@@ -40,17 +41,17 @@ class ProtectedMediaIdentifierInfoBarDelegate : public ConfirmInfoBarDelegate {
 
  private:
   // ConfirmInfoBarDelegate:
-  virtual void InfoBarDismissed() OVERRIDE;
-  virtual int GetIconID() const OVERRIDE;
-  virtual Type GetInfoBarType() const OVERRIDE;
+  virtual void InfoBarDismissed() override;
+  virtual int GetIconID() const override;
+  virtual Type GetInfoBarType() const override;
   virtual bool ShouldExpireInternal(
-      const content::LoadCommittedDetails& details) const OVERRIDE;
-  virtual base::string16 GetMessageText() const OVERRIDE;
-  virtual base::string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
-  virtual bool Accept() OVERRIDE;
-  virtual bool Cancel() OVERRIDE;
-  virtual base::string16 GetLinkText() const OVERRIDE;
-  virtual bool LinkClicked(WindowOpenDisposition disposition) OVERRIDE;
+      const NavigationDetails& details) const override;
+  virtual base::string16 GetMessageText() const override;
+  virtual base::string16 GetButtonLabel(InfoBarButton button) const override;
+  virtual bool Accept() override;
+  virtual bool Cancel() override;
+  virtual base::string16 GetLinkText() const override;
+  virtual bool LinkClicked(WindowOpenDisposition disposition) override;
 
   PermissionQueueController* controller_;
   const PermissionRequestID id_;