Make 'Load full site' a button instead of link.

chrome/browser/ui/content_settings/content_setting_bubble_model.cc

 // Copyright (c) 2012 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/ui/content_settings/content_setting_bubble_model.h"
 
 #include <stddef.h>
 
 #include "base/command_line.h"
 #include "base/macros.h"
@@ skipping 97 matching lines @@
 ContentSettingSimpleBubbleModel::ContentSettingSimpleBubbleModel(
     Delegate* delegate,
     WebContents* web_contents,
     Profile* profile,
     ContentSettingsType content_type)
     : ContentSettingBubbleModel(delegate, web_contents, profile),
         content_type_(content_type) {
   // Notifications do not have a bubble.
   DCHECK_NE(content_type, CONTENT_SETTINGS_TYPE_NOTIFICATIONS);
   SetTitle();
-  SetManageLink();
+  SetManageText();
   SetCustomLink();
 }
 
 ContentSettingSimpleBubbleModel*
     ContentSettingSimpleBubbleModel::AsSimpleBubbleModel() {
   return this;
 }
 
 void ContentSettingSimpleBubbleModel::SetTitle() {
   TabSpecificContentSettings* content_settings = NULL;
@@ skipping 26 matching lines @@
       !content_settings->IsContentBlocked(content_type())) {
     title_ids = kAccessedTitleIDs;
     num_title_ids = arraysize(kAccessedTitleIDs);
   }
   int title_id =
       GetIdForContentType(title_ids, num_title_ids, content_type());
   if (title_id)
     set_title(l10n_util::GetStringUTF16(title_id));
 }
 
-void ContentSettingSimpleBubbleModel::SetManageLink() {
+void ContentSettingSimpleBubbleModel::SetManageText() {
   static const ContentSettingsTypeIdEntry kLinkIDs[] = {
     {CONTENT_SETTINGS_TYPE_COOKIES, IDS_BLOCKED_COOKIES_LINK},
     {CONTENT_SETTINGS_TYPE_IMAGES, IDS_BLOCKED_IMAGES_LINK},
     {CONTENT_SETTINGS_TYPE_JAVASCRIPT, IDS_BLOCKED_JAVASCRIPT_LINK},
     {CONTENT_SETTINGS_TYPE_PLUGINS, IDS_BLOCKED_PLUGINS_LINK},
     {CONTENT_SETTINGS_TYPE_POPUPS, IDS_BLOCKED_POPUPS_LINK},
     {CONTENT_SETTINGS_TYPE_GEOLOCATION, IDS_GEOLOCATION_BUBBLE_MANAGE_LINK},
     {CONTENT_SETTINGS_TYPE_MIXEDSCRIPT, IDS_LEARN_MORE},
     {CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS, IDS_HANDLERS_BUBBLE_MANAGE_LINK},
     {CONTENT_SETTINGS_TYPE_PPAPI_BROKER, IDS_PPAPI_BROKER_BUBBLE_MANAGE_LINK},
     {CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS, IDS_BLOCKED_DOWNLOADS_LINK},
     {CONTENT_SETTINGS_TYPE_MIDI_SYSEX, IDS_MIDI_SYSEX_BUBBLE_MANAGE_LINK},
   };
-  set_manage_link(l10n_util::GetStringUTF8(
+  set_manage_text(l10n_util::GetStringUTF8(
       GetIdForContentType(kLinkIDs, arraysize(kLinkIDs), content_type())));
 }
 
 void ContentSettingSimpleBubbleModel::OnManageLinkClicked() {
   if (delegate())
     delegate()->ShowContentSettingsPage(content_type());
 
   if (content_type() == CONTENT_SETTINGS_TYPE_PLUGINS) {
     content_settings::RecordPluginsAction(
         content_settings::PLUGINS_ACTION_CLICKED_MANAGE_PLUGIN_BLOCKING);
@@ skipping 420 matching lines @@
   radio_item_setting_[1] = CONTENT_SETTING_BLOCK;
 
   TabSpecificContentSettings* content_settings =
       TabSpecificContentSettings::FromWebContents(web_contents);
   state_ = content_settings->GetMicrophoneCameraState();
   DCHECK(CameraAccessed() || MicrophoneAccessed());
 
   SetTitle();
   SetRadioGroup();
   SetMediaMenus();
-  SetManageLink();
+  SetManageText();
   SetCustomLink();
 }
 
 ContentSettingMediaStreamBubbleModel::~ContentSettingMediaStreamBubbleModel() {
   // On some platforms (e.g. MacOS X) it is possible to close a tab while the
   // media stream bubble is open. This resets the web contents to NULL.
   if (!web_contents())
     return;
 
   for (const std::pair<content::MediaStreamType, MediaMenu>& media_menu :
@@ skipping 222 matching lines @@
       }
 
       camera_menu.default_device =
           GetMediaDeviceById(preferred_camera, cameras);
       camera_menu.selected_device = camera_menu.default_device;
     }
     add_media_menu(content::MEDIA_DEVICE_VIDEO_CAPTURE, camera_menu);
   }
 }
 
-void ContentSettingMediaStreamBubbleModel::SetManageLink() {
+void ContentSettingMediaStreamBubbleModel::SetManageText() {
   // By default, the manage link refers to both media types. We only need
   // to change the link text if only one media type was accessed.
   int link_id;
   if (CameraAccessed() && MicrophoneAccessed()) {
     link_id = IDS_MEDIASTREAM_BUBBLE_MANAGE_LINK;
   } else if (CameraAccessed()) {
     link_id = IDS_MEDIASTREAM_CAMERA_BUBBLE_MANAGE_LINK;
   } else if (MicrophoneAccessed()) {
     link_id = IDS_MEDIASTREAM_MICROPHONE_BUBBLE_MANAGE_LINK;
   } else {
     NOTREACHED();
     return;
   }
 
-  set_manage_link(l10n_util::GetStringUTF8(link_id));
+  set_manage_text(l10n_util::GetStringUTF8(link_id));
 }
 
 void ContentSettingMediaStreamBubbleModel::SetCustomLink() {
   TabSpecificContentSettings* content_settings =
       TabSpecificContentSettings::FromWebContents(web_contents());
   if (content_settings->IsMicrophoneCameraStateChanged()) {
     set_custom_link(l10n_util::GetStringUTF8(
         IDS_MEDIASTREAM_SETTING_CHANGED_MESSAGE));
   }
 }
@@ skipping 304 matching lines @@
 
 // ContentSettingSubresourceFilterBubbleModel ----------------------------------
 
 ContentSettingSubresourceFilterBubbleModel::
     ContentSettingSubresourceFilterBubbleModel(Delegate* delegate,
                                                WebContents* web_contents,
                                                Profile* profile)
     : ContentSettingBubbleModel(delegate, web_contents, profile) {
   SetTitle();
   SetMessage();
-  SetManageLink();
+  SetManageText();
 }
 
 ContentSettingSubresourceFilterBubbleModel::
     ~ContentSettingSubresourceFilterBubbleModel() {}
 
 void ContentSettingSubresourceFilterBubbleModel::SetTitle() {
   set_title(
       l10n_util::GetStringUTF16(IDS_FILTERED_DECEPTIVE_CONTENT_PROMPT_TITLE));
 }
 
-void ContentSettingSubresourceFilterBubbleModel::SetManageLink() {
-  // TODO(melandory): introduce the button instead of link.
-  set_manage_link(
+void ContentSettingSubresourceFilterBubbleModel::SetManageText() {
+  set_manage_text(
       l10n_util::GetStringUTF8(IDS_FILTERED_DECEPTIVE_CONTENT_PROMPT_RELOAD));
+  set_show_manage_text_as_button(true);
 }
 
 void ContentSettingSubresourceFilterBubbleModel::SetMessage() {
   set_message(l10n_util::GetStringUTF16(
       IDS_FILTERED_DECEPTIVE_CONTENT_PROMPT_EXPLANATION));
 }
 
 void ContentSettingSubresourceFilterBubbleModel::OnManageLinkClicked() {
   subresource_filter::ContentSubresourceFilterDriverFactory* driver_factory =
       subresource_filter::ContentSubresourceFilterDriverFactory::
@@ skipping 170 matching lines @@
 
 ContentSettingBubbleModel::MediaMenu::MediaMenu() : disabled(false) {}
 
 ContentSettingBubbleModel::MediaMenu::MediaMenu(const MediaMenu& other) =
     default;
 
 ContentSettingBubbleModel::MediaMenu::~MediaMenu() {}
 
 ContentSettingBubbleModel::BubbleContent::BubbleContent()
     : radio_group_enabled(false),
-      custom_link_enabled(false) {
-}
+      custom_link_enabled(false),
+      show_manage_text_as_button(false) {}
 
 ContentSettingBubbleModel::BubbleContent::~BubbleContent() {}
 
 void ContentSettingBubbleModel::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   if (type == content::NOTIFICATION_WEB_CONTENTS_DESTROYED) {
     DCHECK_EQ(web_contents_,
               content::Source<WebContents>(source).ptr());
@@ skipping 14 matching lines @@
 ContentSettingMediaStreamBubbleModel*
     ContentSettingBubbleModel::AsMediaStreamBubbleModel() {
   // In general, bubble models might not inherit from the media bubble model.
   return nullptr;
 }
 
 ContentSettingSubresourceFilterBubbleModel*
 ContentSettingBubbleModel::AsSubresourceFilterBubbleModel() {
   return nullptr;
 }