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

Side by Side Diff: chrome/browser/ui/views/bookmarks/bookmark_context_menu.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
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/bookmarks/bookmark_context_menu.h" 5 #include "chrome/browser/ui/views/bookmarks/bookmark_context_menu.h"
6 6
7 #include "base/i18n/rtl.h" 7 #include "base/i18n/rtl.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "chrome/app/chrome_command_ids.h" 9 #include "chrome/app/chrome_command_ids.h"
10 #include "chrome/browser/bookmarks/bookmark_model.h" 10 #include "chrome/browser/bookmarks/bookmark_model.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 ui::SimpleMenuModel* menu_model = controller_->menu_model(); 52 ui::SimpleMenuModel* menu_model = controller_->menu_model();
53 for (int i = 0; i < menu_model->GetItemCount(); ++i) { 53 for (int i = 0; i < menu_model->GetItemCount(); ++i) {
54 menu_->AppendMenuItemFromModel( 54 menu_->AppendMenuItemFromModel(
55 menu_model, i, menu_model->GetCommandIdAt(i)); 55 menu_model, i, menu_model->GetCommandIdAt(i));
56 } 56 }
57 } 57 }
58 58
59 BookmarkContextMenu::~BookmarkContextMenu() { 59 BookmarkContextMenu::~BookmarkContextMenu() {
60 } 60 }
61 61
62 void BookmarkContextMenu::RunMenuAt(const gfx::Point& point) { 62 void BookmarkContextMenu::RunMenuAt(const gfx::Point& point,
63 ui::MenuSourceType source_type) {
63 content::NotificationService::current()->Notify( 64 content::NotificationService::current()->Notify(
64 chrome::NOTIFICATION_BOOKMARK_CONTEXT_MENU_SHOWN, 65 chrome::NOTIFICATION_BOOKMARK_CONTEXT_MENU_SHOWN,
65 content::Source<BookmarkContextMenu>(this), 66 content::Source<BookmarkContextMenu>(this),
66 content::NotificationService::NoDetails()); 67 content::NotificationService::NoDetails());
67 // width/height don't matter here. 68 // width/height don't matter here.
68 if (menu_runner_->RunMenuAt( 69 if (menu_runner_->RunMenuAt(
69 parent_widget_, NULL, gfx::Rect(point.x(), point.y(), 0, 0), 70 parent_widget_, NULL, gfx::Rect(point.x(), point.y(), 0, 0),
70 views::MenuItemView::TOPLEFT, 71 views::MenuItemView::TOPLEFT, source_type,
71 (views::MenuRunner::HAS_MNEMONICS | views::MenuRunner::IS_NESTED | 72 (views::MenuRunner::HAS_MNEMONICS | views::MenuRunner::IS_NESTED |
72 views::MenuRunner::CONTEXT_MENU)) == 73 views::MenuRunner::CONTEXT_MENU)) ==
73 views::MenuRunner::MENU_DELETED) 74 views::MenuRunner::MENU_DELETED)
74 return; 75 return;
75 } 76 }
76 77
77 void BookmarkContextMenu::SetPageNavigator(PageNavigator* navigator) { 78 void BookmarkContextMenu::SetPageNavigator(PageNavigator* navigator) {
78 controller_->set_navigator(navigator); 79 controller_->set_navigator(navigator);
79 } 80 }
80 81
(...skipping 28 matching lines...) Expand all
109 int command_id, 110 int command_id,
110 const std::vector<const BookmarkNode*>& bookmarks) { 111 const std::vector<const BookmarkNode*>& bookmarks) {
111 if (observer_ && IsRemoveBookmarksCommand(command_id)) 112 if (observer_ && IsRemoveBookmarksCommand(command_id))
112 observer_->WillRemoveBookmarks(bookmarks); 113 observer_->WillRemoveBookmarks(bookmarks);
113 } 114 }
114 115
115 void BookmarkContextMenu::DidExecuteCommand(int command_id) { 116 void BookmarkContextMenu::DidExecuteCommand(int command_id) {
116 if (observer_ && IsRemoveBookmarksCommand(command_id)) 117 if (observer_ && IsRemoveBookmarksCommand(command_id))
117 observer_->DidRemoveBookmarks(); 118 observer_->DidRemoveBookmarks();
118 } 119 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/bookmarks/bookmark_context_menu.h ('k') | chrome/browser/ui/views/bookmarks/bookmark_editor_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698