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

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

Issue 1682603002: [UI Views] Don't allow a ButtonListener and a MenuButtonListener (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Latest master Created 4 years, 10 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
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 <stddef.h> 7 #include <stddef.h>
8 8
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/strings/string16.h" 10 #include "base/strings/string16.h"
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 int index_; 94 int index_;
95 Listener* listener_; 95 Listener* listener_;
96 scoped_ptr<PermissionMenuModel> model_; 96 scoped_ptr<PermissionMenuModel> model_;
97 scoped_ptr<views::MenuRunner> menu_runner_; 97 scoped_ptr<views::MenuRunner> menu_runner_;
98 }; 98 };
99 99
100 PermissionCombobox::PermissionCombobox(Listener* listener, 100 PermissionCombobox::PermissionCombobox(Listener* listener,
101 int index, 101 int index,
102 const GURL& url, 102 const GURL& url,
103 ContentSetting setting) 103 ContentSetting setting)
104 : MenuButton(nullptr, base::string16(), this, true), 104 : MenuButton(base::string16(), this, true),
105 index_(index), 105 index_(index),
106 listener_(listener), 106 listener_(listener),
107 model_(new PermissionMenuModel( 107 model_(new PermissionMenuModel(
108 url, 108 url,
109 setting, 109 setting,
110 base::Bind(&PermissionCombobox::PermissionChanged, 110 base::Bind(&PermissionCombobox::PermissionChanged,
111 base::Unretained(this)))) { 111 base::Unretained(this)))) {
112 SetText(model_->GetLabelAt(model_->GetIndexOfCommandId(setting))); 112 SetText(model_->GetLabelAt(model_->GetIndexOfCommandId(setting)));
113 SizeToPreferredSize(); 113 SizeToPreferredSize();
114 } 114 }
(...skipping 381 matching lines...) Expand 10 before | Expand all | Expand 10 after
496 496
497 void PermissionBubbleViewViews::Accept() { 497 void PermissionBubbleViewViews::Accept() {
498 if (delegate_) 498 if (delegate_)
499 delegate_->Accept(); 499 delegate_->Accept();
500 } 500 }
501 501
502 void PermissionBubbleViewViews::Deny() { 502 void PermissionBubbleViewViews::Deny() {
503 if (delegate_) 503 if (delegate_)
504 delegate_->Deny(); 504 delegate_->Deny();
505 } 505 }
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