| OLD | NEW |
| 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_mac.h" | 5 #include "chrome/browser/tab_contents/web_drag_bookmark_handler_mac.h" |
| 6 | 6 |
| 7 #include "chrome/browser/ui/browser.h" | 7 #include "chrome/browser/ui/browser.h" |
| 8 #include "chrome/browser/ui/browser_finder.h" | 8 #include "chrome/browser/ui/browser_finder.h" |
| 9 #include "chrome/browser/ui/browser_window.h" | 9 #include "chrome/browser/ui/browser_window.h" |
| 10 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h" | 10 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h" |
| 11 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" | 11 #include "chrome/browser/ui/tab_contents/tab_contents.h" |
| 12 #include "content/public/browser/web_contents.h" | 12 #include "content/public/browser/web_contents.h" |
| 13 | 13 |
| 14 using content::WebContents; | 14 using content::WebContents; |
| 15 | 15 |
| 16 WebDragBookmarkHandlerMac::WebDragBookmarkHandlerMac() | 16 WebDragBookmarkHandlerMac::WebDragBookmarkHandlerMac() |
| 17 : tab_(NULL) { | 17 : tab_(NULL) { |
| 18 } | 18 } |
| 19 | 19 |
| 20 WebDragBookmarkHandlerMac::~WebDragBookmarkHandlerMac() {} | 20 WebDragBookmarkHandlerMac::~WebDragBookmarkHandlerMac() {} |
| 21 | 21 |
| 22 void WebDragBookmarkHandlerMac::DragInitialize(WebContents* contents) { | 22 void WebDragBookmarkHandlerMac::DragInitialize(WebContents* contents) { |
| 23 DCHECK(tab_ ? (tab_->web_contents() == contents) : true); | 23 DCHECK(tab_ ? (tab_->web_contents() == contents) : true); |
| 24 if (!tab_) | 24 if (!tab_) |
| 25 tab_ = TabContentsWrapper::GetCurrentWrapperForContents(contents); | 25 tab_ = TabContents::FromWebContents(contents); |
| 26 | 26 |
| 27 bookmark_drag_data_.ReadFromDragClipboard(); | 27 bookmark_drag_data_.ReadFromDragClipboard(); |
| 28 } | 28 } |
| 29 | 29 |
| 30 void WebDragBookmarkHandlerMac::OnDragOver() { | 30 void WebDragBookmarkHandlerMac::OnDragOver() { |
| 31 if (tab_ && tab_->bookmark_tab_helper()->GetBookmarkDragDelegate()) { | 31 if (tab_ && tab_->bookmark_tab_helper()->GetBookmarkDragDelegate()) { |
| 32 tab_->bookmark_tab_helper()->GetBookmarkDragDelegate()->OnDragOver( | 32 tab_->bookmark_tab_helper()->GetBookmarkDragDelegate()->OnDragOver( |
| 33 bookmark_drag_data_); | 33 bookmark_drag_data_); |
| 34 } | 34 } |
| 35 } | 35 } |
| (...skipping 21 matching lines...) Expand all Loading... |
| 57 browser->window()->Show(); | 57 browser->window()->Show(); |
| 58 } | 58 } |
| 59 } | 59 } |
| 60 | 60 |
| 61 void WebDragBookmarkHandlerMac::OnDragLeave() { | 61 void WebDragBookmarkHandlerMac::OnDragLeave() { |
| 62 if (tab_ && tab_->bookmark_tab_helper()->GetBookmarkDragDelegate()) { | 62 if (tab_ && tab_->bookmark_tab_helper()->GetBookmarkDragDelegate()) { |
| 63 tab_->bookmark_tab_helper()->GetBookmarkDragDelegate()->OnDragLeave( | 63 tab_->bookmark_tab_helper()->GetBookmarkDragDelegate()->OnDragLeave( |
| 64 bookmark_drag_data_); | 64 bookmark_drag_data_); |
| 65 } | 65 } |
| 66 } | 66 } |
| OLD | NEW |