diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-09 23:41:48 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-09 23:41:48 +0000 |
| commit | 981e66948a84c10067e9064b6ef482ba5bb277cf (patch) | |
| tree | c67dd1a65eee9d5174c4bfdd269f6bdc2acac430 /chrome/browser/bookmarks | |
| parent | e2e88e7f5dbcbb2367d632b534ca0e75aab9f25c (diff) | |
| download | chromium_src-981e66948a84c10067e9064b6ef482ba5bb277cf.zip chromium_src-981e66948a84c10067e9064b6ef482ba5bb277cf.tar.gz chromium_src-981e66948a84c10067e9064b6ef482ba5bb277cf.tar.bz2 | |
Revert 74377 - Migrate Event API methods to Google Style.
BUG=72040
TEST=none
Review URL: http://codereview.chromium.org/6480001
TBR=ben@chromium.org
Review URL: http://codereview.chromium.org/6469014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74379 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/bookmarks')
| -rw-r--r-- | chrome/browser/bookmarks/bookmark_drop_info.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/bookmarks/bookmark_utils.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/bookmarks/bookmark_drop_info.cc b/chrome/browser/bookmarks/bookmark_drop_info.cc index 30d1f03..ba9d7a0 100644 --- a/chrome/browser/bookmarks/bookmark_drop_info.cc +++ b/chrome/browser/bookmarks/bookmark_drop_info.cc @@ -26,7 +26,7 @@ BookmarkDropInfo::~BookmarkDropInfo() { } void BookmarkDropInfo::Update(const views::DropTargetEvent& event) { - source_operations_ = event.source_operations(); + source_operations_ = event.GetSourceOperations(); is_control_down_ = event.IsControlDown(); last_y_ = event.y(); diff --git a/chrome/browser/bookmarks/bookmark_utils.cc b/chrome/browser/bookmarks/bookmark_utils.cc index 42bde4a3..6e26e9b 100644 --- a/chrome/browser/bookmarks/bookmark_utils.cc +++ b/chrome/browser/bookmarks/bookmark_utils.cc @@ -244,7 +244,7 @@ int BookmarkDropOperation(Profile* profile, return ui::DragDropTypes::DRAG_MOVE; } // User is dragging from another app, copy. - return PreferredDropOperation(event.source_operations(), + return PreferredDropOperation(event.GetSourceOperations(), ui::DragDropTypes::DRAG_COPY | ui::DragDropTypes::DRAG_LINK); } |