[WebsiteSettings] Change permission bubble API to adapt to new mocks.

chrome/browser/ui/views/website_settings/permissions_bubble_view.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/ui/views/website_settings/permissions_bubble_view.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/website_settings/permission_bubble_request.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 140 matching lines @@
         l10n_util::GetStringUTF16(IDS_PERMISSION_CUSTOMIZE));
     customize->SetStyle(views::Button::STYLE_TEXTBUTTON);
     customize->SetTextColor(views::Button::STATE_NORMAL, SK_ColorBLUE);
     customize->SetTextColor(views::Button::STATE_HOVERED, SK_ColorBLUE);
     customize->SetTextColor(views::Button::STATE_PRESSED, SK_ColorBLUE);
     button_layout->AddView(customize);
   } else {
     button_layout->AddView(new views::View());
   }
 
-  // Lay out the Deny/Allow buttons. Use custom text if there is only
-  // one permission request.
-  base::string16 deny_text;
-  base::string16 allow_text;
-  if (requests.size() == 1) {
-    deny_text = requests[0]->GetAlternateDenyButtonText();
-    allow_text = requests[0]->GetAlternateAcceptButtonText();
-  }
-
-  if (deny_text.empty())
-    deny_text = l10n_util::GetStringUTF16(IDS_PERMISSION_DENY);
-  if (allow_text.empty())
-    allow_text = l10n_util::GetStringUTF16(IDS_PERMISSION_ALLOW);
-
+  // Lay out the Deny/Allow buttons.
+  base::string16 deny_text = l10n_util::GetStringUTF16(IDS_PERMISSION_DENY);
   views::LabelButton* deny_button = new views::LabelButton(this, deny_text);
   deny_button->SetStyle(views::Button::STYLE_BUTTON);
   deny_button->SetFontList(rb.GetFontList(ui::ResourceBundle::MediumFont));
   button_layout->AddView(deny_button);
   deny_ = deny_button;
 
+  base::string16 allow_text = l10n_util::GetStringUTF16(IDS_PERMISSION_ALLOW);
   views::LabelButton* allow_button = new views::LabelButton(this, allow_text);
   allow_button->SetStyle(views::Button::STYLE_BUTTON);
   allow_button->SetFontList(rb.GetFontList(ui::ResourceBundle::MediumFont));
   button_layout->AddView(allow_button);
   allow_ = allow_button;
 
   button_layout->AddPaddingRow(0, kBubbleOuterMargin);
 }
 
 PermissionsBubbleDelegateView::~PermissionsBubbleDelegateView() {
@@ skipping 71 matching lines @@
   PermissionsBubbleDelegateView* bubble_delegate =
       new PermissionsBubbleDelegateView(anchor_view_, this,
                                         requests, values, customization_mode);
   bubble_delegate_ = bubble_delegate;
   views::BubbleDelegateView::CreateBubble(bubble_delegate_);
 
   bubble_delegate_->StartFade(true);
   bubble_delegate->SizeToContents();
 }
 
+bool PermissionBubbleViewViews::CanAcceptRequestUpdate() {
+  // TODO(gbillock): support this.
+  // return bubble_delegate_ && bubble_delegate_->IsMouseHovered();
+  return false;
+}
+
 void PermissionBubbleViewViews::Hide() {
   if (bubble_delegate_) {
     bubble_delegate_->Close();
     bubble_delegate_ = NULL;
   }
 }
 
 void PermissionBubbleViewViews::Closing() {
   if (bubble_delegate_)
     bubble_delegate_ = NULL;
@@ skipping 13 matching lines @@
 
 void PermissionBubbleViewViews::Deny() {
   if (delegate_)
     delegate_->Deny();
 }
 
 void PermissionBubbleViewViews::SetCustomizationMode() {
   if (delegate_)
     delegate_->SetCustomizationMode();
 }