[reland] views: Move MenuButton from TextButton to LabelButton.

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/views/website_settings/permission_selector_view.h"
 #include "chrome/browser/ui/views/website_settings/permission_selector_view_observer.h"
 #include "chrome/browser/ui/website_settings/permission_bubble_request.h"
@@ skipping 81 matching lines @@
           base::Bind(&PermissionCombobox::PermissionChanged,
                      base::Unretained(this)))) {
   SetText(model_->GetLabelAt(model_->GetIndexOfCommandId(setting)));
   SizeToPreferredSize();
 }
 
 PermissionCombobox::~PermissionCombobox() {}
 
 void PermissionCombobox::GetAccessibleState(ui::AXViewState* state) {
   MenuButton::GetAccessibleState(state);
-  state->value = text();
+  state->value = GetText();
 }
 
 void PermissionCombobox::OnMenuButtonClicked(View* source,
                                              const gfx::Point& point) {
   menu_runner_.reset(new views::MenuRunner(model_.get()));
 
   gfx::Point p(point);
   p.Offset(-source->width(), 0);
   if (menu_runner_->RunMenuAt(source->GetWidget()->GetTopLevelWidget(),
                               this,
@@ skipping 353 matching lines @@
 
 void PermissionBubbleViewViews::Deny() {
   if (delegate_)
     delegate_->Deny();
 }
 
 void PermissionBubbleViewViews::SetCustomizationMode() {
   if (delegate_)
     delegate_->SetCustomizationMode();
 }