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

Unified Diff: chrome/browser/ui/views/omnibox/inline_omnibox_popup_view.cc

Issue 10828265: Replace views::LocatedEvent with ui::LocatedEvent (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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/omnibox/inline_omnibox_popup_view.cc
===================================================================
--- chrome/browser/ui/views/omnibox/inline_omnibox_popup_view.cc (revision 151267)
+++ chrome/browser/ui/views/omnibox/inline_omnibox_popup_view.cc (working copy)
@@ -98,7 +98,7 @@
// Make the children line up with the LocationBar.
gfx::Point content_origin;
// TODO(sky): this won't work correctly with LocationBarContainer.
- views::View::ConvertPointToView(location_bar_, this, &content_origin);
+ views::View::ConvertPointToTarget(location_bar_, this, &content_origin);
int x = content_origin.x();
int width = location_bar_->width();
gfx::Rect contents_rect = GetContentsBounds();
@@ -367,7 +367,7 @@
for (int i = 0; i < nb_match; ++i) {
views::View* child = child_at(i);
gfx::Point point_in_child_coords(point);
- View::ConvertPointToView(this, child, &point_in_child_coords);
+ View::ConvertPointToTarget(this, child, &point_in_child_coords);
if (child->HitTestPoint(point_in_child_coords))
return i;
}
@@ -379,7 +379,7 @@
}
void InlineOmniboxPopupView::UpdateLineEvent(
- const views::LocatedEvent& event,
+ const ui::LocatedEvent& event,
bool should_set_selected_line) {
size_t index = GetIndexForPoint(event.location());
model_->SetHoveredLine(index);
@@ -388,7 +388,7 @@
}
void InlineOmniboxPopupView::OpenSelectedLine(
- const views::LocatedEvent& event,
+ const ui::LocatedEvent& event,
WindowOpenDisposition disposition) {
size_t index = GetIndexForPoint(event.location());
OpenIndex(index, disposition);

Powered by Google App Engine
This is Rietveld 408576698