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

Side by Side Diff: components/renderer_context_menu/views/toolkit_delegate_views.cc

Issue 2790773002: Cleanup MenuRunner API (Closed)
Patch Set: Rebase Created 3 years, 8 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 "components/renderer_context_menu/views/toolkit_delegate_views.h" 5 #include "components/renderer_context_menu/views/toolkit_delegate_views.h"
6 6
7 #include "ui/gfx/geometry/rect.h" 7 #include "ui/gfx/geometry/rect.h"
8 #include "ui/gfx/image/image.h" 8 #include "ui/gfx/image/image.h"
9 #include "ui/views/controls/menu/menu_item_view.h" 9 #include "ui/views/controls/menu/menu_item_view.h"
10 #include "ui/views/controls/menu/menu_model_adapter.h" 10 #include "ui/views/controls/menu/menu_model_adapter.h"
11 #include "ui/views/controls/menu/menu_runner.h" 11 #include "ui/views/controls/menu/menu_runner.h"
12 12
13 ToolkitDelegateViews::ToolkitDelegateViews() : menu_view_(NULL) {} 13 ToolkitDelegateViews::ToolkitDelegateViews() : menu_view_(NULL) {}
14 14
15 ToolkitDelegateViews::~ToolkitDelegateViews() {} 15 ToolkitDelegateViews::~ToolkitDelegateViews() {}
16 16
17 void ToolkitDelegateViews::RunMenuAt(views::Widget* parent, 17 void ToolkitDelegateViews::RunMenuAt(views::Widget* parent,
18 const gfx::Point& point, 18 const gfx::Point& point,
19 ui::MenuSourceType type) { 19 ui::MenuSourceType type) {
20 views::MenuAnchorPosition anchor_position = 20 views::MenuAnchorPosition anchor_position =
21 (type == ui::MENU_SOURCE_TOUCH || 21 (type == ui::MENU_SOURCE_TOUCH ||
22 type == ui::MENU_SOURCE_TOUCH_EDIT_MENU) 22 type == ui::MENU_SOURCE_TOUCH_EDIT_MENU)
23 ? views::MENU_ANCHOR_BOTTOMCENTER 23 ? views::MENU_ANCHOR_BOTTOMCENTER
24 : views::MENU_ANCHOR_TOPLEFT; 24 : views::MENU_ANCHOR_TOPLEFT;
25 ignore_result(menu_runner_->RunMenuAt( 25 menu_runner_->RunMenuAt(parent, NULL, gfx::Rect(point, gfx::Size()),
26 parent, NULL, gfx::Rect(point, gfx::Size()), anchor_position, type)); 26 anchor_position, type);
27 } 27 }
28 28
29 void ToolkitDelegateViews::Init(ui::SimpleMenuModel* menu_model) { 29 void ToolkitDelegateViews::Init(ui::SimpleMenuModel* menu_model) {
30 menu_adapter_.reset(new views::MenuModelAdapter(menu_model)); 30 menu_adapter_.reset(new views::MenuModelAdapter(menu_model));
31 menu_view_ = menu_adapter_->CreateMenu(); 31 menu_view_ = menu_adapter_->CreateMenu();
32 menu_runner_.reset( 32 menu_runner_.reset(new views::MenuRunner(
33 new views::MenuRunner(menu_view_, views::MenuRunner::HAS_MNEMONICS | 33 menu_view_,
34 views::MenuRunner::CONTEXT_MENU | 34 views::MenuRunner::HAS_MNEMONICS | views::MenuRunner::CONTEXT_MENU));
35 views::MenuRunner::ASYNC));
36 } 35 }
37 36
38 void ToolkitDelegateViews::Cancel() { 37 void ToolkitDelegateViews::Cancel() {
39 DCHECK(menu_runner_.get()); 38 DCHECK(menu_runner_.get());
40 menu_runner_->Cancel(); 39 menu_runner_->Cancel();
41 } 40 }
42 41
43 void ToolkitDelegateViews::UpdateMenuItem(int command_id, 42 void ToolkitDelegateViews::UpdateMenuItem(int command_id,
44 bool enabled, 43 bool enabled,
45 bool hidden, 44 bool hidden,
(...skipping 22 matching lines...) Expand all
68 67
69 item->SetIcon(*image.ToImageSkia()); 68 item->SetIcon(*image.ToImageSkia());
70 69
71 views::MenuItemView* parent = item->GetParentMenuItem(); 70 views::MenuItemView* parent = item->GetParentMenuItem();
72 if (!parent) 71 if (!parent)
73 return; 72 return;
74 73
75 parent->ChildrenChanged(); 74 parent->ChildrenChanged();
76 } 75 }
77 #endif 76 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698