[Abandoned] rename PermissionBubbleRequest to PermissionRequest.

chrome/browser/permissions/permission_request_impl.cc

Index: chrome/browser/permissions/permission_request_impl.cc
diff --git a/chrome/browser/permissions/permission_bubble_request_impl.cc b/chrome/browser/permissions/permission_request_impl.cc
similarity index 84%
rename from chrome/browser/permissions/permission_bubble_request_impl.cc
rename to chrome/browser/permissions/permission_request_impl.cc
index dfbe7c2ea5b440fe814073db22f8579f281e1c5e..7deb63167f4e2cec377d9340886ab6a0b5172c4c 100644
--- a/chrome/browser/permissions/permission_bubble_request_impl.cc
+++ b/chrome/browser/permissions/permission_request_impl.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/permissions/permission_bubble_request_impl.h"
+#include "chrome/browser/permissions/permission_request_impl.h"
 
 #include "build/build_config.h"
 #include "chrome/browser/permissions/permission_context_base.h"
@@ -12,9 +12,10 @@
 #include "grit/theme_resources.h"
 #include "net/base/escape.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/vector_icons_public.h"
 
-PermissionBubbleRequestImpl::PermissionBubbleRequestImpl(
+PermissionRequestImpl::PermissionRequestImpl(
     const GURL& request_origin,
     content::PermissionType permission_type,
     const PermissionDecidedCallback& permission_decided_callback,
@@ -26,14 +27,14 @@ PermissionBubbleRequestImpl::PermissionBubbleRequestImpl(
       is_finished_(false),
       action_taken_(false) {}
 
-PermissionBubbleRequestImpl::~PermissionBubbleRequestImpl() {
+PermissionRequestImpl::~PermissionRequestImpl() {
   DCHECK(is_finished_);
   if (!action_taken_)
     PermissionUmaUtil::PermissionIgnored(permission_type_, request_origin_);
 }
 
-gfx::VectorIconId PermissionBubbleRequestImpl::GetVectorIconId() const {
-#if !defined(OS_MACOSX)
+gfx::VectorIconId PermissionRequestImpl::GetVectorIconId() const {
+#if !defined(OS_MACOSX) && !defined(OS_ANDROID)
   switch (permission_type_) {
     case content::PermissionType::GEOLOCATION:
       return gfx::VectorIconId::LOCATION_ON;
@@ -52,12 +53,12 @@ gfx::VectorIconId PermissionBubbleRequestImpl::GetVectorIconId() const {
       NOTREACHED();
       return gfx::VectorIconId::VECTOR_ICON_NONE;
   }
-#else  // !defined(OS_MACOSX)
+#else  // !defined(OS_MACOSX) && !defined(OS_ANDROID)
   return gfx::VectorIconId::VECTOR_ICON_NONE;
 #endif
 }
 
-int PermissionBubbleRequestImpl::GetIconId() const {
+int PermissionRequestImpl::GetIconId() const {
   int icon_id = IDR_INFOBAR_WARNING;
 #if defined(OS_MACOSX)
   switch (permission_type_) {
@@ -79,7 +80,7 @@ int PermissionBubbleRequestImpl::GetIconId() const {
   return icon_id;
 }
 
-base::string16 PermissionBubbleRequestImpl::GetMessageText() const {
+base::string16 PermissionRequestImpl::GetMessageText() const {
   int message_id;
   switch (permission_type_) {
     case content::PermissionType::GEOLOCATION:
@@ -111,7 +112,7 @@ base::string16 PermissionBubbleRequestImpl::GetMessageText() const {
           request_origin_, url_formatter::SchemeDisplay::OMIT_CRYPTOGRAPHIC));
 }
 
-base::string16 PermissionBubbleRequestImpl::GetMessageTextFragment() const {
+base::string16 PermissionRequestImpl::GetMessageTextFragment() const {
   int message_id;
   switch (permission_type_) {
     case content::PermissionType::GEOLOCATION:
@@ -140,31 +141,31 @@ base::string16 PermissionBubbleRequestImpl::GetMessageTextFragment() const {
   return l10n_util::GetStringUTF16(message_id);
 }
 
-GURL PermissionBubbleRequestImpl::GetOrigin() const {
+GURL PermissionRequestImpl::GetOrigin() const {
   return request_origin_;
 }
 
-void PermissionBubbleRequestImpl::PermissionGranted() {
+void PermissionRequestImpl::PermissionGranted() {
   RegisterActionTaken();
   permission_decided_callback_.Run(true, CONTENT_SETTING_ALLOW);
 }
 
-void PermissionBubbleRequestImpl::PermissionDenied() {
+void PermissionRequestImpl::PermissionDenied() {
   RegisterActionTaken();
   permission_decided_callback_.Run(true, CONTENT_SETTING_BLOCK);
 }
 
-void PermissionBubbleRequestImpl::Cancelled() {
+void PermissionRequestImpl::Cancelled() {
   RegisterActionTaken();
   permission_decided_callback_.Run(false, CONTENT_SETTING_DEFAULT);
 }
 
-void PermissionBubbleRequestImpl::RequestFinished() {
+void PermissionRequestImpl::RequestFinished() {
   is_finished_ = true;
   delete_callback_.Run();
 }
 
-PermissionBubbleType PermissionBubbleRequestImpl::GetPermissionBubbleType()
+PermissionBubbleType PermissionRequestImpl::GetPermissionBubbleType()
     const {
   return PermissionBubbleType::PERMISSION;
 }