Split Mac WebDropTarget into two, content and chrome.

chrome/browser/tab_contents/web_drag_bookmark_handler_gtk.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/tab_contents/web_drag_bookmark_handler_gtk.h"
 
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.h"
 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "ui/base/dragdrop/gtk_dnd_util.h"
 
 WebDragBookmarkHandlerGtk::WebDragBookmarkHandlerGtk()
     : tab_(NULL) {
 }
 
 WebDragBookmarkHandlerGtk::~WebDragBookmarkHandlerGtk() {}
 
 void WebDragBookmarkHandlerGtk::DragInitialize(TabContents* contents) {
   bookmark_drag_data_.Clear();
 
   // Ideally we would want to initialize the the TabContentsWrapper member in
   // the constructor. We cannot do that as the WebDragDestGtk object is
   // created during the construction of the TabContents object.  The
   // TabContentsWrapper is created much later.
+  DCHECK(tab_ ? (tab_->tab_contents() == contents) : true);
   if (!tab_)
     tab_ = TabContentsWrapper::GetCurrentWrapperForContents(contents);
 }
 
 GdkAtom WebDragBookmarkHandlerGtk::GetBookmarkTargetAtom() const {
   // For GTK, bookmark drag data is encoded as pickle and associated with
   // ui::CHROME_BOOKMARK_ITEM. See bookmark_utils::WriteBookmarksToSelection()
   // for details.
   return ui::GetAtomForTarget(ui::CHROME_BOOKMARK_ITEM);
 }
 
 void WebDragBookmarkHandlerGtk::OnReceiveDataFromGtk(GtkSelectionData* data) {
   if (tab_) {
     Profile* profile = tab_->profile();
     bookmark_drag_data_.ReadFromVector(
         bookmark_utils::GetNodesFromSelection(
             NULL, data,
             ui::CHROME_BOOKMARK_ITEM,
             profile, NULL, NULL));
     bookmark_drag_data_.SetOriginatingProfile(profile);
   }
 }
 
 void WebDragBookmarkHandlerGtk::OnReceiveProcessedData(const GURL& url,
                                                        const string16& title) {
   bookmark_drag_data_.ReadFromTuple(url, title);
 }
 
 void WebDragBookmarkHandlerGtk::OnDragOver() {
-  if (tab_ && tab_->bookmark_tab_helper()->GetBookmarkDragDelegate())
+  if (tab_ && tab_->bookmark_tab_helper()->GetBookmarkDragDelegate()) {
     tab_->bookmark_tab_helper()->GetBookmarkDragDelegate()->OnDragOver(
         bookmark_drag_data_);
+  }
 }
 
 void WebDragBookmarkHandlerGtk::OnDragEnter() {
   // This is non-null if tab_contents_ is showing an ExtensionWebUI with
   // support for (at the moment experimental) drag and drop extensions.
-  if (tab_ && tab_->bookmark_tab_helper()->GetBookmarkDragDelegate())
+  if (tab_ && tab_->bookmark_tab_helper()->GetBookmarkDragDelegate()) {
     tab_->bookmark_tab_helper()->GetBookmarkDragDelegate()->OnDragEnter(
         bookmark_drag_data_);
+  }
 }
 
 void WebDragBookmarkHandlerGtk::OnDrop() {
   // This is non-null if tab_contents_ is showing an ExtensionWebUI with
   // support for (at the moment experimental) drag and drop extensions.
   if (tab_) {
     if (tab_->bookmark_tab_helper()->GetBookmarkDragDelegate()) {
       tab_->bookmark_tab_helper()->GetBookmarkDragDelegate()->OnDrop(
           bookmark_drag_data_);
     }
 
     // Focus the target browser.
     Browser* browser = Browser::GetBrowserForController(
         &tab_->controller(), NULL);
     if (browser)
       browser->window()->Show();
   }
 }
 
 void WebDragBookmarkHandlerGtk::OnDragLeave() {
-  if (tab_ && tab_->bookmark_tab_helper()->GetBookmarkDragDelegate())
+  if (tab_ && tab_->bookmark_tab_helper()->GetBookmarkDragDelegate()) {
     tab_->bookmark_tab_helper()->GetBookmarkDragDelegate()->OnDragLeave(
         bookmark_drag_data_);
+  }
 }