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

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

Issue 331993009: MacViews: Run native Cocoa context menus to support Services. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add VIEWS_EXPORT for unit test access Created 6 years, 5 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/string16.h" 7 #include "base/strings/string16.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 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 104
105 PermissionCombobox::~PermissionCombobox() {} 105 PermissionCombobox::~PermissionCombobox() {}
106 106
107 void PermissionCombobox::GetAccessibleState(ui::AXViewState* state) { 107 void PermissionCombobox::GetAccessibleState(ui::AXViewState* state) {
108 MenuButton::GetAccessibleState(state); 108 MenuButton::GetAccessibleState(state);
109 state->value = GetText(); 109 state->value = GetText();
110 } 110 }
111 111
112 void PermissionCombobox::OnMenuButtonClicked(View* source, 112 void PermissionCombobox::OnMenuButtonClicked(View* source,
113 const gfx::Point& point) { 113 const gfx::Point& point) {
114 menu_runner_.reset(new views::MenuRunner(model_.get())); 114 menu_runner_.reset(
115 new views::MenuRunner(model_.get(), views::MenuRunner::HAS_MNEMONICS));
115 116
116 gfx::Point p(point); 117 gfx::Point p(point);
117 p.Offset(-source->width(), 0); 118 p.Offset(-source->width(), 0);
118 if (menu_runner_->RunMenuAt(source->GetWidget()->GetTopLevelWidget(), 119 if (menu_runner_->RunMenuAt(source->GetWidget()->GetTopLevelWidget(),
119 this, 120 this,
120 gfx::Rect(p, gfx::Size()), 121 gfx::Rect(p, gfx::Size()),
121 views::MENU_ANCHOR_TOPLEFT, 122 views::MENU_ANCHOR_TOPLEFT,
122 ui::MENU_SOURCE_NONE, 123 ui::MENU_SOURCE_NONE) ==
123 views::MenuRunner::HAS_MNEMONICS) ==
124 views::MenuRunner::MENU_DELETED) { 124 views::MenuRunner::MENU_DELETED) {
125 return; 125 return;
126 } 126 }
127 } 127 }
128 128
129 void PermissionCombobox::PermissionChanged( 129 void PermissionCombobox::PermissionChanged(
130 const WebsiteSettingsUI::PermissionInfo& permission) { 130 const WebsiteSettingsUI::PermissionInfo& permission) {
131 SetText(model_->GetLabelAt(model_->GetIndexOfCommandId(permission.setting))); 131 SetText(model_->GetLabelAt(model_->GetIndexOfCommandId(permission.setting)));
132 SizeToPreferredSize(); 132 SizeToPreferredSize();
133 133
(...skipping 341 matching lines...) Expand 10 before | Expand all | Expand 10 after
475 475
476 void PermissionBubbleViewViews::Deny() { 476 void PermissionBubbleViewViews::Deny() {
477 if (delegate_) 477 if (delegate_)
478 delegate_->Deny(); 478 delegate_->Deny();
479 } 479 }
480 480
481 void PermissionBubbleViewViews::SetCustomizationMode() { 481 void PermissionBubbleViewViews::SetCustomizationMode() {
482 if (delegate_) 482 if (delegate_)
483 delegate_->SetCustomizationMode(); 483 delegate_->SetCustomizationMode();
484 } 484 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698