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 77%
rename from chrome/browser/permissions/permission_bubble_request_impl.cc
rename to chrome/browser/permissions/permission_request_impl.cc
index 20017753f8c837f8a765390fe0888fbc495a50ee..a674fb34b6cbd886109168b31c3a60cc601bb75f 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"
@@ -14,7 +14,7 @@
 #include "ui/base/l10n/l10n_util.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 +26,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 +52,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)

[felt, 2016/07/19 00:21:28]

does this one also need the !defined(OS_ANDROID) guard?

[tsergeant, 2016/07/19 01:40:37]

Done. It's not necessary for the file to compile (which is all it's doing on
Android now), but it'll be needed eventually.

   switch (permission_type_) {
@@ -79,7 +79,7 @@ int PermissionBubbleRequestImpl::GetIconId() const {
   return icon_id;
 }
 
-base::string16 PermissionBubbleRequestImpl::GetMessageTextFragment() const {
+base::string16 PermissionRequestImpl::GetMessageTextFragment() const {
   int message_id;
   switch (permission_type_) {
     case content::PermissionType::GEOLOCATION:
@@ -108,49 +108,49 @@ 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()
+PermissionRequestType PermissionRequestImpl::GetPermissionRequestType()
     const {
   switch (permission_type_) {
     case content::PermissionType::GEOLOCATION:
-      return PermissionBubbleType::PERMISSION_GEOLOCATION;
+      return PermissionRequestType::PERMISSION_GEOLOCATION;
 #if defined(ENABLE_NOTIFICATIONS)
     case content::PermissionType::NOTIFICATIONS:
-      return PermissionBubbleType::PERMISSION_NOTIFICATIONS;
+      return PermissionRequestType::PERMISSION_NOTIFICATIONS;
 #endif
     case content::PermissionType::MIDI_SYSEX:
-      return PermissionBubbleType::PERMISSION_MIDI_SYSEX;
+      return PermissionRequestType::PERMISSION_MIDI_SYSEX;
     case content::PermissionType::PUSH_MESSAGING:
-      return PermissionBubbleType::PERMISSION_PUSH_MESSAGING;
+      return PermissionRequestType::PERMISSION_PUSH_MESSAGING;
 #if defined(OS_CHROMEOS)
     case content::PermissionType::PROTECTED_MEDIA_IDENTIFIER:
-      return PermissionBubbleType::PERMISSION_PROTECTED_MEDIA_IDENTIFIER;
+      return PermissionRequestType::PERMISSION_PROTECTED_MEDIA_IDENTIFIER;
 #endif
     default:
       NOTREACHED();
-      return PermissionBubbleType::UNKNOWN;
+      return PermissionRequestType::UNKNOWN;
   }
 }