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

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

Issue 10827271: Replace views::Event with ui::Event. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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_model_factory.h" 10 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 void BookmarkMenuController::SetPageNavigator(PageNavigator* navigator) { 86 void BookmarkMenuController::SetPageNavigator(PageNavigator* navigator) {
87 menu_delegate_->SetPageNavigator(navigator); 87 menu_delegate_->SetPageNavigator(navigator);
88 } 88 }
89 89
90 string16 BookmarkMenuController::GetTooltipText(int id, 90 string16 BookmarkMenuController::GetTooltipText(int id,
91 const gfx::Point& p) const { 91 const gfx::Point& p) const {
92 return menu_delegate_->GetTooltipText(id, p); 92 return menu_delegate_->GetTooltipText(id, p);
93 } 93 }
94 94
95 bool BookmarkMenuController::IsTriggerableEvent(views::MenuItemView* menu, 95 bool BookmarkMenuController::IsTriggerableEvent(views::MenuItemView* menu,
96 const views::Event& e) { 96 const ui::Event& e) {
97 return menu_delegate_->IsTriggerableEvent(menu, e); 97 return menu_delegate_->IsTriggerableEvent(menu, e);
98 } 98 }
99 99
100 void BookmarkMenuController::ExecuteCommand(int id, int mouse_event_flags) { 100 void BookmarkMenuController::ExecuteCommand(int id, int mouse_event_flags) {
101 menu_delegate_->ExecuteCommand(id, mouse_event_flags); 101 menu_delegate_->ExecuteCommand(id, mouse_event_flags);
102 } 102 }
103 103
104 bool BookmarkMenuController::GetDropFormats( 104 bool BookmarkMenuController::GetDropFormats(
105 MenuItemView* menu, 105 MenuItemView* menu,
106 int* formats, 106 int* formats,
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 if (!menu_delegate_->is_mutating_model()) 188 if (!menu_delegate_->is_mutating_model())
189 menu()->Cancel(); 189 menu()->Cancel();
190 } 190 }
191 191
192 BookmarkMenuController::~BookmarkMenuController() { 192 BookmarkMenuController::~BookmarkMenuController() {
193 BookmarkModelFactory::GetForProfile( 193 BookmarkModelFactory::GetForProfile(
194 menu_delegate_->profile())->RemoveObserver(this); 194 menu_delegate_->profile())->RemoveObserver(this);
195 if (observer_) 195 if (observer_)
196 observer_->BookmarkMenuDeleted(this); 196 observer_->BookmarkMenuDeleted(this);
197 } 197 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698