Migrate geolocation permissions to the new common permission class.

chrome/browser/content_settings/permission_bubble_request_impl.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/content_settings/permission_bubble_request_impl.h"
 
 #include "chrome/browser/content_settings/permission_context_base.h"
 #include "chrome/browser/content_settings/permission_context_uma_util.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
@@ skipping 19 matching lines @@
 
 PermissionBubbleRequestImpl::~PermissionBubbleRequestImpl() {
   DCHECK(is_finished_);
   if (!action_taken_)
     PermissionContextUmaUtil::PermissionIgnored(type_);
 }
 
 int PermissionBubbleRequestImpl::GetIconID() const {
   int icon_id;
   switch (type_) {
+    case CONTENT_SETTINGS_TYPE_GEOLOCATION:
+      icon_id = IDR_INFOBAR_GEOLOCATION;
+      break;
 #if defined(ENABLE_NOTIFICATIONS)
     case CONTENT_SETTINGS_TYPE_NOTIFICATIONS:
       icon_id = IDR_INFOBAR_DESKTOP_NOTIFICATIONS;
       break;
 #endif
     case CONTENT_SETTINGS_TYPE_MIDI_SYSEX:
       icon_id = IDR_ALLOWED_MIDI_SYSEX;
       break;
     case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING:
       icon_id = IDR_INFOBAR_WARNING;
       break;
     default:
       NOTREACHED();
       return IDR_INFOBAR_WARNING;
   }
   return icon_id;
 }
 
 base::string16 PermissionBubbleRequestImpl::GetMessageText() const {
   int message_id;
   switch (type_) {
+    case CONTENT_SETTINGS_TYPE_GEOLOCATION:
+      message_id = IDS_GEOLOCATION_INFOBAR_QUESTION;
+      break;
 #if defined(ENABLE_NOTIFICATIONS)
       case CONTENT_SETTINGS_TYPE_NOTIFICATIONS:

[Bernhard Bauer, 2014/08/13 13:34:32]

Nit: these case statements aren't correctly aligned.

[Miguel Garcia, 2014/08/13 14:25:50]

Done.

         message_id = IDS_NOTIFICATION_PERMISSIONS;
         break;
 #endif
       case CONTENT_SETTINGS_TYPE_MIDI_SYSEX:
         message_id = IDS_MIDI_SYSEX_INFOBAR_QUESTION;
         break;
       case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING:
         message_id = IDS_PUSH_MESSAGES_PERMISSION_QUESTION;
         break;
       default:
         NOTREACHED();
         return base::string16();
     }
   return l10n_util::GetStringFUTF16(
       message_id,
       net::FormatUrl(request_origin_, display_languages_,
                      net::kFormatUrlOmitUsernamePassword |
                      net::kFormatUrlOmitTrailingSlashOnBareHostname,
                      net::UnescapeRule::SPACES, NULL, NULL, NULL));
 }
 
 base::string16 PermissionBubbleRequestImpl::GetMessageTextFragment() const {
   int message_id;
   switch (type_) {
+    case CONTENT_SETTINGS_TYPE_GEOLOCATION:
+      message_id = IDS_GEOLOCATION_INFOBAR_PERMISSION_FRAGMENT;
+      break;
 #if defined(ENABLE_NOTIFICATIONS)
     case CONTENT_SETTINGS_TYPE_NOTIFICATIONS:
       message_id = IDS_NOTIFICATION_PERMISSIONS_FRAGMENT;
       break;
 #endif
     case CONTENT_SETTINGS_TYPE_MIDI_SYSEX:
       message_id = IDS_MIDI_SYSEX_PERMISSION_FRAGMENT;
       break;
     case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING:
       message_id = IDS_PUSH_MESSAGES_BUBBLE_FRAGMENT;
@@ skipping 25 matching lines @@
 
 void PermissionBubbleRequestImpl::Cancelled() {
   RegisterActionTaken();
   permission_decided_callback_.Run(false, false);
 }
 
 void PermissionBubbleRequestImpl::RequestFinished() {
   is_finished_ = true;
   delete_callback_.Run();
 }