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

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

Issue 250943008: Move enum MenuAnchorPosition to reduce deps on menu_item_view.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: another rebase for r267046 conflict Created 6 years, 7 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 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 MenuButton::GetAccessibleState(state); 101 MenuButton::GetAccessibleState(state);
102 state->value = text(); 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( 111 if (menu_runner_->RunMenuAt(source->GetWidget()->GetTopLevelWidget(),
112 source->GetWidget()->GetTopLevelWidget(), 112 this,
113 this, 113 gfx::Rect(p, gfx::Size()),
114 gfx::Rect(p, gfx::Size()), 114 views::MENU_ANCHOR_TOPLEFT,
115 views::MenuItemView::TOPLEFT, 115 ui::MENU_SOURCE_NONE,
116 ui::MENU_SOURCE_NONE, 116 views::MenuRunner::HAS_MNEMONICS) ==
117 views::MenuRunner::HAS_MNEMONICS) == views::MenuRunner::MENU_DELETED) 117 views::MenuRunner::MENU_DELETED) {
118 return; 118 return;
119 }
119 } 120 }
120 121
121 void PermissionCombobox::PermissionChanged( 122 void PermissionCombobox::PermissionChanged(
122 const WebsiteSettingsUI::PermissionInfo& permission) { 123 const WebsiteSettingsUI::PermissionInfo& permission) {
123 SetText(model_->GetLabelAt(model_->GetIndexOfCommandId(permission.setting))); 124 SetText(model_->GetLabelAt(model_->GetIndexOfCommandId(permission.setting)));
124 SizeToPreferredSize(); 125 SizeToPreferredSize();
125 126
126 listener_->PermissionSelectionChanged( 127 listener_->PermissionSelectionChanged(
127 index_, permission.setting == CONTENT_SETTING_ALLOW); 128 index_, permission.setting == CONTENT_SETTING_ALLOW);
128 } 129 }
(...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after
466 467
467 void PermissionBubbleViewViews::Deny() { 468 void PermissionBubbleViewViews::Deny() {
468 if (delegate_) 469 if (delegate_)
469 delegate_->Deny(); 470 delegate_->Deny();
470 } 471 }
471 472
472 void PermissionBubbleViewViews::SetCustomizationMode() { 473 void PermissionBubbleViewViews::SetCustomizationMode() {
473 if (delegate_) 474 if (delegate_)
474 delegate_->SetCustomizationMode(); 475 delegate_->SetCustomizationMode();
475 } 476 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698