Rid the world of the last of views::Event types: TouchEvent, GestureEvent, MouseWheelEvent, ScrollE…

chrome/browser/bookmarks/bookmark_utils.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 
 #include <utility>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
@@ skipping 22 matching lines @@
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/tree_node_iterator.h"
 
 #if defined(OS_MACOSX)
 #include "chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.h"
 #endif
 
 #if defined(TOOLKIT_VIEWS)
 #include "ui/base/dragdrop/os_exchange_data.h"
+#include "ui/base/event.h"
 #include "ui/views/drag_utils.h"
-#include "ui/views/events/event.h"
 #include "ui/views/widget/native_widget.h"
 #include "ui/views/widget/widget.h"
 #endif
 
 #if defined(TOOLKIT_GTK)
 #include "chrome/browser/ui/gtk/custom_drag.h"
 #endif
 
 using base::Time;
 using content::OpenURLParams;
@@ skipping 147 matching lines @@
   if (!profile->GetPrefs()->GetBoolean(prefs::kEditBookmarksEnabled))
     move = 0;
   if (node->is_url()) {
     return ui::DragDropTypes::DRAG_COPY | ui::DragDropTypes::DRAG_LINK | move;
   }
   return ui::DragDropTypes::DRAG_COPY | move;
 }
 
 #if defined(TOOLKIT_VIEWS)
 int BookmarkDropOperation(Profile* profile,
-                          const views::DropTargetEvent& event,
+                          const ui::DropTargetEvent& event,
                           const BookmarkNodeData& data,
                           const BookmarkNode* parent,
                           int index) {
   if (data.IsFromProfile(profile) && data.size() > 1)
     // Currently only accept one dragged node at a time.
     return ui::DragDropTypes::DRAG_NONE;
 
   if (!bookmark_utils::IsValidDropLocation(profile, data, parent, index))
     return ui::DragDropTypes::DRAG_NONE;
 
@@ skipping 494 matching lines @@
 void DisableBookmarkBarViewAnimationsForTesting(bool disabled) {
   g_bookmark_bar_view_animations_disabled = disabled;
 }
 
 bool IsBookmarkBarViewAnimationsDisabled() {
   return g_bookmark_bar_view_animations_disabled;
 }
 #endif
 
 }  // namespace bookmark_utils