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

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

Issue 10535088: TabContentsWrapper -> TabContents, part 30. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 6 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/tab_contents/web_drag_bookmark_handler_aura.h" 5 #include "chrome/browser/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 "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" 12 #include "chrome/browser/ui/tab_contents/tab_contents.h"
13 #include "content/public/browser/web_contents.h" 13 #include "content/public/browser/web_contents.h"
14 #include "ui/base/dragdrop/os_exchange_data.h" 14 #include "ui/base/dragdrop/os_exchange_data.h"
15 #include "ui/base/dragdrop/os_exchange_data_provider_aura.h" 15 #include "ui/base/dragdrop/os_exchange_data_provider_aura.h"
16 #include "webkit/glue/webdropdata.h" 16 #include "webkit/glue/webdropdata.h"
17 17
18 using content::WebContents; 18 using content::WebContents;
19 19
20 WebDragBookmarkHandlerAura::WebDragBookmarkHandlerAura() 20 WebDragBookmarkHandlerAura::WebDragBookmarkHandlerAura()
21 : tab_(NULL) { 21 : tab_(NULL) {
22 } 22 }
23 23
24 WebDragBookmarkHandlerAura::~WebDragBookmarkHandlerAura() { 24 WebDragBookmarkHandlerAura::~WebDragBookmarkHandlerAura() {
25 } 25 }
26 26
27 void WebDragBookmarkHandlerAura::DragInitialize(WebContents* contents) { 27 void WebDragBookmarkHandlerAura::DragInitialize(WebContents* contents) {
28 // Ideally we would want to initialize the the TabContentsWrapper member in 28 // Ideally we would want to initialize the the TabContents member in
29 // the constructor. We cannot do that as the WebDragDest object is 29 // the constructor. We cannot do that as the WebDragDest object is
30 // created during the construction of the WebContents object. The 30 // created during the construction of the WebContents object. The
31 // TabContentsWrapper is created much later. 31 // TabContents is created much later.
32 DCHECK(tab_ ? (tab_->web_contents() == contents) : true); 32 DCHECK(tab_ ? (tab_->web_contents() == contents) : true);
33 if (!tab_) 33 if (!tab_)
34 tab_ = TabContentsWrapper::GetCurrentWrapperForContents(contents); 34 tab_ = TabContents::FromWebContents(contents);
35 } 35 }
36 36
37 void WebDragBookmarkHandlerAura::OnDragOver() { 37 void WebDragBookmarkHandlerAura::OnDragOver() {
38 if (tab_ && tab_->bookmark_tab_helper()->GetBookmarkDragDelegate()) { 38 if (tab_ && tab_->bookmark_tab_helper()->GetBookmarkDragDelegate()) {
39 if (bookmark_drag_data_.is_valid()) 39 if (bookmark_drag_data_.is_valid())
40 tab_->bookmark_tab_helper()->GetBookmarkDragDelegate()->OnDragOver( 40 tab_->bookmark_tab_helper()->GetBookmarkDragDelegate()->OnDragOver(
41 bookmark_drag_data_); 41 bookmark_drag_data_);
42 } 42 }
43 } 43 }
44 44
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 80
81 void WebDragBookmarkHandlerAura::OnDragLeave() { 81 void WebDragBookmarkHandlerAura::OnDragLeave() {
82 if (tab_ && tab_->bookmark_tab_helper()->GetBookmarkDragDelegate()) { 82 if (tab_ && tab_->bookmark_tab_helper()->GetBookmarkDragDelegate()) {
83 if (bookmark_drag_data_.is_valid()) 83 if (bookmark_drag_data_.is_valid())
84 tab_->bookmark_tab_helper()->GetBookmarkDragDelegate()->OnDragLeave( 84 tab_->bookmark_tab_helper()->GetBookmarkDragDelegate()->OnDragLeave(
85 bookmark_drag_data_); 85 bookmark_drag_data_);
86 } 86 }
87 87
88 bookmark_drag_data_.Clear(); 88 bookmark_drag_data_.Clear();
89 } 89 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698