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

Unified Diff: chrome/browser/ui/views/bookmark_bar_view.cc

Issue 6250014: Move more dnd related files to ui/base (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 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
« no previous file with comments | « chrome/browser/ui/views/bookmark_bar_view.h ('k') | chrome/browser/ui/views/browser_actions_container.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/bookmark_bar_view.cc
===================================================================
--- chrome/browser/ui/views/bookmark_bar_view.cc (revision 71798)
+++ chrome/browser/ui/views/bookmark_bar_view.cc (working copy)
@@ -674,7 +674,7 @@
bookmark_drop_menu_->Cancel();
if (!drop_info_.get() || !drop_info_->drag_operation)
- return DragDropTypes::DRAG_NONE;
+ return ui::DragDropTypes::DRAG_NONE;
const BookmarkNode* root =
drop_info_->is_over_other ? model_->other_node() :
@@ -1134,7 +1134,7 @@
// the new tab page, on the new tab page size_animation_ is always 0). This
// typically is only hit if the user does something to inadvertanty trigger
// dnd, such as pressing the mouse and hitting control-b.
- return DragDropTypes::DRAG_NONE;
+ return ui::DragDropTypes::DRAG_NONE;
}
for (int i = 0; i < GetBookmarkButtonCount(); ++i) {
@@ -1144,7 +1144,7 @@
}
}
NOTREACHED();
- return DragDropTypes::DRAG_NONE;
+ return ui::DragDropTypes::DRAG_NONE;
}
bool BookmarkBarView::CanStartDrag(views::View* sender,
@@ -1426,7 +1426,7 @@
event.y() >= other_bookmarked_button_->y() +
other_bookmarked_button_->height()) {
// Mouse isn't over a button.
- return DragDropTypes::DRAG_NONE;
+ return ui::DragDropTypes::DRAG_NONE;
}
bool found = false;
@@ -1441,8 +1441,8 @@
// No bookmarks, accept the drop.
*index = 0;
int ops = data.GetFirstNode(profile_)
- ? DragDropTypes::DRAG_MOVE
- : DragDropTypes::DRAG_COPY | DragDropTypes::DRAG_LINK;
+ ? ui::DragDropTypes::DRAG_MOVE
+ : ui::DragDropTypes::DRAG_COPY | ui::DragDropTypes::DRAG_LINK;
return
bookmark_utils::PreferredDropOperation(event.GetSourceOperations(),
ops);
@@ -1488,14 +1488,14 @@
// use the last visible index.
*index = GetFirstHiddenNodeIndex();
} else {
- return DragDropTypes::DRAG_NONE;
+ return ui::DragDropTypes::DRAG_NONE;
}
} else if (mirrored_x < other_bookmarked_button_->x()) {
// Mouse is after the last visible button but before more recently
// bookmarked; use the last visible index.
*index = GetFirstHiddenNodeIndex();
} else {
- return DragDropTypes::DRAG_NONE;
+ return ui::DragDropTypes::DRAG_NONE;
}
}
« no previous file with comments | « chrome/browser/ui/views/bookmark_bar_view.h ('k') | chrome/browser/ui/views/browser_actions_container.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698