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

Side by Side Diff: chrome/browser/ui/views/website_settings/permission_selector_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: fix indent 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/permission_selector_view.h" 5 #include "chrome/browser/ui/views/website_settings/permission_selector_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/website_settings/permission_menu_model.h" 8 #include "chrome/browser/ui/website_settings/permission_menu_model.h"
9 #include "chrome/browser/ui/website_settings/website_settings_ui.h" 9 #include "chrome/browser/ui/website_settings/website_settings_ui.h"
10 #include "grit/generated_resources.h" 10 #include "grit/generated_resources.h"
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 MenuButton::GetAccessibleState(state); 110 MenuButton::GetAccessibleState(state);
111 state->value = text(); 111 state->value = text();
112 } 112 }
113 113
114 void PermissionMenuButton::OnMenuButtonClicked(View* source, 114 void PermissionMenuButton::OnMenuButtonClicked(View* source,
115 const gfx::Point& point) { 115 const gfx::Point& point) {
116 menu_runner_.reset(new views::MenuRunner(menu_model_)); 116 menu_runner_.reset(new views::MenuRunner(menu_model_));
117 117
118 gfx::Point p(point); 118 gfx::Point p(point);
119 p.Offset(-source->width(), 0); 119 p.Offset(-source->width(), 0);
120 if (menu_runner_->RunMenuAt( 120 if (menu_runner_->RunMenuAt(source->GetWidget()->GetTopLevelWidget(),
121 source->GetWidget()->GetTopLevelWidget(), 121 this,
122 this, 122 gfx::Rect(p, gfx::Size()),
123 gfx::Rect(p, gfx::Size()), 123 views::MENU_ANCHOR_TOPLEFT,
124 views::MenuItemView::TOPLEFT, 124 ui::MENU_SOURCE_NONE,
125 ui::MENU_SOURCE_NONE, 125 views::MenuRunner::HAS_MNEMONICS) ==
126 views::MenuRunner::HAS_MNEMONICS) == views::MenuRunner::MENU_DELETED) 126 views::MenuRunner::MENU_DELETED) {
127 return; 127 return;
128 }
128 } 129 }
129 130
130 } // namespace internal 131 } // namespace internal
131 132
132 /////////////////////////////////////////////////////////////////////////////// 133 ///////////////////////////////////////////////////////////////////////////////
133 // PermissionSelectorView 134 // PermissionSelectorView
134 /////////////////////////////////////////////////////////////////////////////// 135 ///////////////////////////////////////////////////////////////////////////////
135 136
136 PermissionSelectorView::PermissionSelectorView( 137 PermissionSelectorView::PermissionSelectorView(
137 const GURL& url, 138 const GURL& url,
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 // Update the menu button text to reflect the new setting. 228 // Update the menu button text to reflect the new setting.
228 menu_button_->SetText(WebsiteSettingsUI::PermissionActionToUIString( 229 menu_button_->SetText(WebsiteSettingsUI::PermissionActionToUIString(
229 permission.setting, 230 permission.setting,
230 permission.default_setting, 231 permission.default_setting,
231 content_settings::SETTING_SOURCE_USER)); 232 content_settings::SETTING_SOURCE_USER));
232 233
233 FOR_EACH_OBSERVER(PermissionSelectorViewObserver, 234 FOR_EACH_OBSERVER(PermissionSelectorViewObserver,
234 observer_list_, 235 observer_list_,
235 OnPermissionChanged(permission)); 236 OnPermissionChanged(permission));
236 } 237 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/toolbar/wrench_menu.cc ('k') | chrome/browser/ui/views/website_settings/permissions_bubble_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698