| Index: chrome/browser/ui/views/omnibox/omnibox_view_win.cc
|
| ===================================================================
|
| --- chrome/browser/ui/views/omnibox/omnibox_view_win.cc (revision 151481)
|
| +++ chrome/browser/ui/views/omnibox/omnibox_view_win.cc (working copy)
|
| @@ -227,7 +227,7 @@
|
| effect = OnDragOver(data_object, key_state, cursor_position, effect);
|
|
|
| ui::OSExchangeData os_data(new ui::OSExchangeDataProviderWin(data_object));
|
| - views::DropTargetEvent event(os_data, cursor_position.x, cursor_position.y,
|
| + ui::DropTargetEvent event(os_data, cursor_position.x, cursor_position.y,
|
| ui::DragDropTypes::DropEffectToDragOperation(effect));
|
|
|
| int drag_operation = edit_->OnPerformDropImpl(event, edit_->in_drag());
|
| @@ -956,7 +956,7 @@
|
| return native_view_host_;
|
| }
|
|
|
| -int OmniboxViewWin::OnPerformDrop(const views::DropTargetEvent& event) {
|
| +int OmniboxViewWin::OnPerformDrop(const ui::DropTargetEvent& event) {
|
| return OnPerformDropImpl(event, false);
|
| }
|
|
|
| @@ -972,7 +972,7 @@
|
| return WidthNeededToDisplay(GetText().substr(start));
|
| }
|
|
|
| -int OmniboxViewWin::OnPerformDropImpl(const views::DropTargetEvent& event,
|
| +int OmniboxViewWin::OnPerformDropImpl(const ui::DropTargetEvent& event,
|
| bool in_drag) {
|
| const ui::OSExchangeData& data = event.data();
|
|
|
|
|