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

Side by Side Diff: chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc

Issue 10546104: Make IsTriggerableEvent take Event objects and use it to verify whether tap events should trigger. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Pass Event to ShouldEnterPushedState. Created 8 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_menu_controller_views.h" 5 #include "chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h"
6 6
7 #include "base/stl_util.h" 7 #include "base/stl_util.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "chrome/browser/bookmarks/bookmark_model.h" 9 #include "chrome/browser/bookmarks/bookmark_model.h"
10 #include "chrome/browser/bookmarks/bookmark_node_data.h" 10 #include "chrome/browser/bookmarks/bookmark_node_data.h"
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 void BookmarkMenuController::SetPageNavigator(PageNavigator* navigator) { 84 void BookmarkMenuController::SetPageNavigator(PageNavigator* navigator) {
85 menu_delegate_->SetPageNavigator(navigator); 85 menu_delegate_->SetPageNavigator(navigator);
86 } 86 }
87 87
88 string16 BookmarkMenuController::GetTooltipText(int id, 88 string16 BookmarkMenuController::GetTooltipText(int id,
89 const gfx::Point& p) const { 89 const gfx::Point& p) const {
90 return menu_delegate_->GetTooltipText(id, p); 90 return menu_delegate_->GetTooltipText(id, p);
91 } 91 }
92 92
93 bool BookmarkMenuController::IsTriggerableEvent(views::MenuItemView* menu, 93 bool BookmarkMenuController::IsTriggerableEvent(views::MenuItemView* menu,
94 const views::MouseEvent& e) { 94 const views::Event& e) {
95 return menu_delegate_->IsTriggerableEvent(menu, e); 95 return menu_delegate_->IsTriggerableEvent(menu, e);
96 } 96 }
97 97
98 void BookmarkMenuController::ExecuteCommand(int id, int mouse_event_flags) { 98 void BookmarkMenuController::ExecuteCommand(int id, int mouse_event_flags) {
99 menu_delegate_->ExecuteCommand(id, mouse_event_flags); 99 menu_delegate_->ExecuteCommand(id, mouse_event_flags);
100 } 100 }
101 101
102 bool BookmarkMenuController::GetDropFormats( 102 bool BookmarkMenuController::GetDropFormats(
103 MenuItemView* menu, 103 MenuItemView* menu,
104 int* formats, 104 int* formats,
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 void BookmarkMenuController::BookmarkModelChanged() { 185 void BookmarkMenuController::BookmarkModelChanged() {
186 if (!menu_delegate_->is_mutating_model()) 186 if (!menu_delegate_->is_mutating_model())
187 menu()->Cancel(); 187 menu()->Cancel();
188 } 188 }
189 189
190 BookmarkMenuController::~BookmarkMenuController() { 190 BookmarkMenuController::~BookmarkMenuController() {
191 menu_delegate_->profile()->GetBookmarkModel()->RemoveObserver(this); 191 menu_delegate_->profile()->GetBookmarkModel()->RemoveObserver(this);
192 if (observer_) 192 if (observer_)
193 observer_->BookmarkMenuDeleted(this); 193 observer_->BookmarkMenuDeleted(this);
194 } 194 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698