[WIP][POC]

chrome/browser/permissions/permission_infobar_delegate.cc

Index: chrome/browser/permissions/permission_infobar_delegate.cc
diff --git a/chrome/browser/permissions/permission_infobar_delegate.cc b/chrome/browser/permissions/permission_infobar_delegate.cc
index 14a9f5d58be081869d42a5920cff2a3c8e730f40..b1f091ce8ccd60f4b42df92de7ac505bce6287ca 100644
--- a/chrome/browser/permissions/permission_infobar_delegate.cc
+++ b/chrome/browser/permissions/permission_infobar_delegate.cc
@@ -9,10 +9,15 @@
 #include "components/infobars/core/infobar.h"
 #include "components/url_formatter/elide_url.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "chrome/browser/permissions/permission_request.h"
 
 PermissionInfobarDelegate::~PermissionInfobarDelegate() {
-  if (!action_taken_)
-    PermissionUmaUtil::PermissionIgnored(permission_type_, requesting_origin_);
+  // if (!action_taken_)
+  //   PermissionUmaUtil::PermissionIgnored(permission_type_, requesting_origin_);
+}
+
+PermissionInfobarDelegate::PermissionInfobarDelegate(PermissionRequest* request)
+    : request_(request) {
 }
 
 PermissionInfobarDelegate::PermissionInfobarDelegate(
@@ -22,11 +27,15 @@ PermissionInfobarDelegate::PermissionInfobarDelegate(
     const base::Callback<void(bool, bool)>& callback)
     : requesting_origin_(requesting_origin),
       action_taken_(false),
+      // TODO: remove
       permission_type_(permission_type),
+      // TODO: remove
       content_settings_type_(content_settings_type),
       callback_(callback) {}
 
 base::string16 PermissionInfobarDelegate::GetMessageText() const {
+  // TODO:
+  // return request_->GetMessageText();
   return l10n_util::GetStringFUTF16(
       GetMessageResourceId(),
       url_formatter::FormatUrlForSecurityDisplay(
@@ -34,13 +43,18 @@ base::string16 PermissionInfobarDelegate::GetMessageText() const {
           url_formatter::SchemeDisplay::OMIT_CRYPTOGRAPHIC));
 }
 
+int PermissionInfobarDelegate::GetMessageResourceId() const {
+  return IDS_GEOLOCATION_INFOBAR_QUESTION;
+}
+
 infobars::InfoBarDelegate::Type PermissionInfobarDelegate::GetInfoBarType()
     const {
   return PAGE_ACTION_TYPE;
 }
 
 void PermissionInfobarDelegate::InfoBarDismissed() {
-  SetPermission(false, false);
+  // SetPermission(false, false);
+  request_->Cancelled();
 }
 
 PermissionInfobarDelegate*
@@ -55,15 +69,25 @@ base::string16 PermissionInfobarDelegate::GetButtonLabel(
 }
 
 bool PermissionInfobarDelegate::Accept() {
-  SetPermission(true, true);
+  request_->PermissionGranted();
   return true;
 }
 
 bool PermissionInfobarDelegate::Cancel() {
-  SetPermission(true, false);
+  request_->PermissionDenied();
   return true;
 }
 
+infobars::InfoBarDelegate::InfoBarIdentifier
+PermissionInfobarDelegate::GetIdentifier() const {
+  // TODO
+  return GEOLOCATION_INFOBAR_DELEGATE_ANDROID;
+}
+
+int PermissionInfobarDelegate::GetIconId() const {
+  return request_->GetIconId();
+}
+
 void PermissionInfobarDelegate::SetPermission(bool update_content_setting,
                                               bool allowed) {
   action_taken_ = true;