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

Side by Side Diff: chrome/browser/ui/aura/tab_contents/web_drag_bookmark_handler_aura.cc

Issue 18281002: Move WebDropData to content::DropData and split off conversion function. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix Mac build error. Created 7 years, 5 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/aura/tab_contents/web_drag_bookmark_handler_aura.h" 5 #include "chrome/browser/ui/aura/tab_contents/web_drag_bookmark_handler_aura.h"
6 6
7 #include "chrome/browser/bookmarks/bookmark_node_data.h" 7 #include "chrome/browser/bookmarks/bookmark_node_data.h"
8 #include "chrome/browser/ui/browser.h" 8 #include "chrome/browser/ui/browser.h"
9 #include "chrome/browser/ui/browser_finder.h" 9 #include "chrome/browser/ui/browser_finder.h"
10 #include "chrome/browser/ui/browser_window.h" 10 #include "chrome/browser/ui/browser_window.h"
11 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h" 11 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h"
12 #include "content/public/browser/web_contents.h" 12 #include "content/public/browser/web_contents.h"
13 #include "ui/base/dragdrop/os_exchange_data.h" 13 #include "ui/base/dragdrop/os_exchange_data.h"
14 #include "webkit/common/webdropdata.h"
15 14
16 using content::WebContents; 15 using content::WebContents;
17 16
18 WebDragBookmarkHandlerAura::WebDragBookmarkHandlerAura() 17 WebDragBookmarkHandlerAura::WebDragBookmarkHandlerAura()
19 : bookmark_tab_helper_(NULL), 18 : bookmark_tab_helper_(NULL),
20 web_contents_(NULL) { 19 web_contents_(NULL) {
21 } 20 }
22 21
23 WebDragBookmarkHandlerAura::~WebDragBookmarkHandlerAura() { 22 WebDragBookmarkHandlerAura::~WebDragBookmarkHandlerAura() {
24 } 23 }
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 77
79 void WebDragBookmarkHandlerAura::OnDragLeave() { 78 void WebDragBookmarkHandlerAura::OnDragLeave() {
80 if (bookmark_tab_helper_ && bookmark_tab_helper_->bookmark_drag_delegate()) { 79 if (bookmark_tab_helper_ && bookmark_tab_helper_->bookmark_drag_delegate()) {
81 if (bookmark_drag_data_.is_valid()) 80 if (bookmark_drag_data_.is_valid())
82 bookmark_tab_helper_->bookmark_drag_delegate()->OnDragLeave( 81 bookmark_tab_helper_->bookmark_drag_delegate()->OnDragLeave(
83 bookmark_drag_data_); 82 bookmark_drag_data_);
84 } 83 }
85 84
86 bookmark_drag_data_.Clear(); 85 bookmark_drag_data_.Clear();
87 } 86 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698