OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/download/download_shelf_context_menu_view.h" | 5 #include "chrome/browser/ui/views/download/download_shelf_context_menu_view.h" |
6 | 6 |
7 #include "base/i18n/rtl.h" | 7 #include "base/i18n/rtl.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "chrome/browser/download/download_item_model.h" | 9 #include "chrome/browser/download/download_item_model.h" |
10 #include "content/public/browser/download_item.h" | 10 #include "content/public/browser/download_item.h" |
11 #include "content/public/browser/page_navigator.h" | 11 #include "content/public/browser/page_navigator.h" |
12 #include "ui/gfx/point.h" | 12 #include "ui/gfx/point.h" |
13 #include "ui/views/controls/menu/menu_item_view.h" | 13 #include "ui/views/controls/menu/menu_item_view.h" |
14 #include "ui/views/controls/menu/menu_runner.h" | 14 #include "ui/views/controls/menu/menu_runner.h" |
15 | 15 |
16 DownloadShelfContextMenuView::DownloadShelfContextMenuView( | 16 DownloadShelfContextMenuView::DownloadShelfContextMenuView( |
17 content::DownloadItem* download_item, | 17 content::DownloadItem* download_item, |
18 content::PageNavigator* navigator) | 18 content::PageNavigator* navigator) |
19 : DownloadShelfContextMenu(download_item, navigator) { | 19 : DownloadShelfContextMenu(download_item, navigator) { |
20 } | 20 } |
21 | 21 |
22 DownloadShelfContextMenuView::~DownloadShelfContextMenuView() {} | 22 DownloadShelfContextMenuView::~DownloadShelfContextMenuView() {} |
23 | 23 |
24 void DownloadShelfContextMenuView::Run(views::Widget* parent_widget, | 24 void DownloadShelfContextMenuView::Run(views::Widget* parent_widget, |
25 const gfx::Rect& rect) { | 25 const gfx::Rect& rect, |
| 26 ui::MenuSourceType source_type) { |
26 ui::MenuModel* menu_model = GetMenuModel(); | 27 ui::MenuModel* menu_model = GetMenuModel(); |
27 // Run() should not be getting called if the DownloadItem was destroyed. | 28 // Run() should not be getting called if the DownloadItem was destroyed. |
28 DCHECK(menu_model); | 29 DCHECK(menu_model); |
29 | 30 |
30 menu_runner_.reset(new views::MenuRunner(menu_model)); | 31 menu_runner_.reset(new views::MenuRunner(menu_model)); |
31 | 32 |
32 // The menu's alignment is determined based on the UI layout. | 33 // The menu's alignment is determined based on the UI layout. |
33 views::MenuItemView::AnchorPosition position; | 34 views::MenuItemView::AnchorPosition position; |
34 if (base::i18n::IsRTL()) | 35 if (base::i18n::IsRTL()) |
35 position = views::MenuItemView::TOPRIGHT; | 36 position = views::MenuItemView::TOPRIGHT; |
36 else | 37 else |
37 position = views::MenuItemView::TOPLEFT; | 38 position = views::MenuItemView::TOPLEFT; |
38 | 39 |
39 // The return value of RunMenuAt indicates whether the MenuRunner was deleted | 40 // The return value of RunMenuAt indicates whether the MenuRunner was deleted |
40 // while running the menu, which indicates that the containing view may have | 41 // while running the menu, which indicates that the containing view may have |
41 // been deleted. We ignore the return value because our caller already assumes | 42 // been deleted. We ignore the return value because our caller already assumes |
42 // that the view could be deleted by the time we return from here. | 43 // that the view could be deleted by the time we return from here. |
43 ignore_result(menu_runner_->RunMenuAt( | 44 ignore_result(menu_runner_->RunMenuAt( |
44 parent_widget, | 45 parent_widget, |
45 NULL, | 46 NULL, |
46 rect, | 47 rect, |
47 position, | 48 position, |
| 49 source_type, |
48 views::MenuRunner::HAS_MNEMONICS | views::MenuRunner::CONTEXT_MENU)); | 50 views::MenuRunner::HAS_MNEMONICS | views::MenuRunner::CONTEXT_MENU)); |
49 } | 51 } |
OLD | NEW |