Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(84)

Side by Side Diff: chrome/browser/ui/views/website_settings/permissions_bubble_view.cc

Issue 340003002: Revert of views: Move MenuButton from TextButton to LabelButton. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/views/website_settings/permissions_bubble_view.h" 5 #include "chrome/browser/ui/views/website_settings/permissions_bubble_view.h"
6 6
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "chrome/browser/ui/views/website_settings/permission_selector_view.h" 8 #include "chrome/browser/ui/views/website_settings/permission_selector_view.h"
9 #include "chrome/browser/ui/views/website_settings/permission_selector_view_obse rver.h" 9 #include "chrome/browser/ui/views/website_settings/permission_selector_view_obse rver.h"
10 #include "chrome/browser/ui/website_settings/permission_bubble_request.h" 10 #include "chrome/browser/ui/website_settings/permission_bubble_request.h"
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 base::Bind(&PermissionCombobox::PermissionChanged, 92 base::Bind(&PermissionCombobox::PermissionChanged,
93 base::Unretained(this)))) { 93 base::Unretained(this)))) {
94 SetText(model_->GetLabelAt(model_->GetIndexOfCommandId(setting))); 94 SetText(model_->GetLabelAt(model_->GetIndexOfCommandId(setting)));
95 SizeToPreferredSize(); 95 SizeToPreferredSize();
96 } 96 }
97 97
98 PermissionCombobox::~PermissionCombobox() {} 98 PermissionCombobox::~PermissionCombobox() {}
99 99
100 void PermissionCombobox::GetAccessibleState(ui::AXViewState* state) { 100 void PermissionCombobox::GetAccessibleState(ui::AXViewState* state) {
101 MenuButton::GetAccessibleState(state); 101 MenuButton::GetAccessibleState(state);
102 state->value = GetText(); 102 state->value = text();
103 } 103 }
104 104
105 void PermissionCombobox::OnMenuButtonClicked(View* source, 105 void PermissionCombobox::OnMenuButtonClicked(View* source,
106 const gfx::Point& point) { 106 const gfx::Point& point) {
107 menu_runner_.reset(new views::MenuRunner(model_.get())); 107 menu_runner_.reset(new views::MenuRunner(model_.get()));
108 108
109 gfx::Point p(point); 109 gfx::Point p(point);
110 p.Offset(-source->width(), 0); 110 p.Offset(-source->width(), 0);
111 if (menu_runner_->RunMenuAt(source->GetWidget()->GetTopLevelWidget(), 111 if (menu_runner_->RunMenuAt(source->GetWidget()->GetTopLevelWidget(),
112 this, 112 this,
(...skipping 353 matching lines...) Expand 10 before | Expand all | Expand 10 after
466 466
467 void PermissionBubbleViewViews::Deny() { 467 void PermissionBubbleViewViews::Deny() {
468 if (delegate_) 468 if (delegate_)
469 delegate_->Deny(); 469 delegate_->Deny();
470 } 470 }
471 471
472 void PermissionBubbleViewViews::SetCustomizationMode() { 472 void PermissionBubbleViewViews::SetCustomizationMode() {
473 if (delegate_) 473 if (delegate_)
474 delegate_->SetCustomizationMode(); 474 delegate_->SetCustomizationMode();
475 } 475 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/website_settings/permission_selector_view.cc ('k') | ui/app_list/views/search_box_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698