projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 5.34.104.0
[platform/framework/web/crosswalk.git]
/
src
/
chrome
/
browser
/
extensions
/
api
/
bookmark_manager_private
/
bookmark_manager_private_api.cc
diff --git
a/src/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc
b/src/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc
index
03f3f5d
..
24a884d
100644
(file)
--- a/
src/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc
+++ b/
src/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc
@@
-20,7
+20,6
@@
#include "chrome/browser/extensions/api/bookmarks/bookmark_api_constants.h"
#include "chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.h"
#include "chrome/browser/extensions/extension_function_dispatcher.h"
#include "chrome/browser/extensions/api/bookmarks/bookmark_api_constants.h"
#include "chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.h"
#include "chrome/browser/extensions/extension_function_dispatcher.h"
-#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/extensions/extension_web_ui.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/bookmarks/bookmark_drag_drop.h"
#include "chrome/browser/extensions/extension_web_ui.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/bookmarks/bookmark_drag_drop.h"
@@
-35,8
+34,10
@@
#include "content/public/browser/web_contents_view.h"
#include "content/public/browser/web_ui.h"
#include "extensions/browser/event_router.h"
#include "content/public/browser/web_contents_view.h"
#include "content/public/browser/web_ui.h"
#include "extensions/browser/event_router.h"
+#include "extensions/browser/extension_system.h"
#include "extensions/browser/view_type_utils.h"
#include "grit/generated_resources.h"
#include "extensions/browser/view_type_utils.h"
#include "grit/generated_resources.h"
+#include "ui/base/dragdrop/drag_drop_types.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/webui/web_ui_util.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/webui/web_ui_util.h"
@@
-430,8
+431,14
@@
bool BookmarkManagerPrivateStartDragFunction::RunImpl() {
WebContents* web_contents =
dispatcher()->delegate()->GetAssociatedWebContents();
CHECK(web_contents);
WebContents* web_contents =
dispatcher()->delegate()->GetAssociatedWebContents();
CHECK(web_contents);
+
+ ui::DragDropTypes::DragEventSource source =
+ ui::DragDropTypes::DRAG_EVENT_SOURCE_MOUSE;
+ if (params->is_from_touch)
+ source = ui::DragDropTypes::DRAG_EVENT_SOURCE_TOUCH;
+
chrome::DragBookmarks(
chrome::DragBookmarks(
- GetProfile(), nodes, web_contents->GetView()->GetNativeView());
+ GetProfile(), nodes, web_contents->GetView()->GetNativeView()
, source
);
return true;
} else {
return true;
} else {