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

Side by Side Diff: ui/app_list/views/app_list_item_view.cc

Issue 16979002: Add ContextMenuSourceType to views::ContextMenuController::ShowContextMenuForView. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: patch Created 7 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
« no previous file with comments | « ui/app_list/views/app_list_item_view.h ('k') | ui/app_list/views/app_list_menu_views.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "ui/app_list/views/app_list_item_view.h" 5 #include "ui/app_list/views/app_list_item_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "grit/ui_resources.h" 10 #include "grit/ui_resources.h"
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
264 } 264 }
265 } 265 }
266 } 266 }
267 267
268 void AppListItemView::GetAccessibleState(ui::AccessibleViewState* state) { 268 void AppListItemView::GetAccessibleState(ui::AccessibleViewState* state) {
269 state->role = ui::AccessibilityTypes::ROLE_PUSHBUTTON; 269 state->role = ui::AccessibilityTypes::ROLE_PUSHBUTTON;
270 state->name = UTF8ToUTF16(model_->title()); 270 state->name = UTF8ToUTF16(model_->title());
271 } 271 }
272 272
273 void AppListItemView::ShowContextMenuForView(views::View* source, 273 void AppListItemView::ShowContextMenuForView(views::View* source,
274 const gfx::Point& point) { 274 const gfx::Point& point,
275 ui::MenuSourceType source_type) {
275 ui::MenuModel* menu_model = model_->GetContextMenuModel(); 276 ui::MenuModel* menu_model = model_->GetContextMenuModel();
276 if (!menu_model) 277 if (!menu_model)
277 return; 278 return;
278 279
279 context_menu_runner_.reset(new views::MenuRunner(menu_model)); 280 context_menu_runner_.reset(new views::MenuRunner(menu_model));
280 if (context_menu_runner_->RunMenuAt( 281 if (context_menu_runner_->RunMenuAt(
281 GetWidget(), NULL, gfx::Rect(point, gfx::Size()), 282 GetWidget(), NULL, gfx::Rect(point, gfx::Size()),
282 views::MenuItemView::TOPLEFT, views::MenuRunner::HAS_MNEMONICS) == 283 views::MenuItemView::TOPLEFT, source_type,
284 views::MenuRunner::HAS_MNEMONICS) ==
283 views::MenuRunner::MENU_DELETED) 285 views::MenuRunner::MENU_DELETED)
284 return; 286 return;
285 } 287 }
286 288
287 void AppListItemView::StateChanged() { 289 void AppListItemView::StateChanged() {
288 if (state() == STATE_HOVERED || state() == STATE_PRESSED) { 290 if (state() == STATE_HOVERED || state() == STATE_PRESSED) {
289 apps_grid_view_->SetSelectedView(this); 291 apps_grid_view_->SetSelectedView(this);
290 title_->SetEnabledColor(kTitleHoverColor); 292 title_->SetEnabledColor(kTitleHoverColor);
291 } else { 293 } else {
292 apps_grid_view_->ClearSelectedView(this); 294 apps_grid_view_->ClearSelectedView(this);
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
393 SetTouchDragging(false); 395 SetTouchDragging(false);
394 break; 396 break;
395 default: 397 default:
396 break; 398 break;
397 } 399 }
398 if (!event->handled()) 400 if (!event->handled())
399 CustomButton::OnGestureEvent(event); 401 CustomButton::OnGestureEvent(event);
400 } 402 }
401 403
402 } // namespace app_list 404 } // namespace app_list
OLDNEW
« no previous file with comments | « ui/app_list/views/app_list_item_view.h ('k') | ui/app_list/views/app_list_menu_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698