Switch BookmarkTabHelper to use WebContentsUserData.

chrome/browser/tab_contents/web_drag_bookmark_handler_win.cc

 // Copyright (c) 2012 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_win.h"
 
 #include "chrome/browser/bookmarks/bookmark_node_data.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h"
-#include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/dragdrop/os_exchange_data_provider_win.h"
 #include "webkit/glue/webdropdata.h"
 
 using content::WebContents;
 
 WebDragBookmarkHandlerWin::WebDragBookmarkHandlerWin()
-    : tab_(NULL) {
+    : bookmark_tab_helper_(NULL),
+      web_contents_(NULL) {
 }
 
 WebDragBookmarkHandlerWin::~WebDragBookmarkHandlerWin() {
 }
 
 void WebDragBookmarkHandlerWin::DragInitialize(WebContents* contents) {
-  // Ideally we would want to initialize the the TabContents member in
+  // Ideally we would want to initialize the the BookmarkTabHelper member in
   // the constructor. We cannot do that as the WebDragTargetWin object is
   // created during the construction of the WebContents object.  The
-  // TabContents is created much later.
-  DCHECK(tab_ ? (tab_->web_contents() == contents) : true);
-  if (!tab_)
-    tab_ = TabContents::FromWebContents(contents);
+  // BookmarkTabHelper is created much later.
+  web_contents_ = contents;
+  if (!bookmark_tab_helper_)
+    bookmark_tab_helper_ = BookmarkTabHelper::FromWebContents(contents);
 }
 
 void WebDragBookmarkHandlerWin::OnDragOver(IDataObject* data_object) {
-  if (tab_ && tab_->bookmark_tab_helper()->GetBookmarkDragDelegate()) {
+  if (bookmark_tab_helper_ && bookmark_tab_helper_->GetBookmarkDragDelegate()) {
     ui::OSExchangeData os_exchange_data(
         new ui::OSExchangeDataProviderWin(data_object));
     BookmarkNodeData bookmark_drag_data;
     if (bookmark_drag_data.Read(os_exchange_data))
-      tab_->bookmark_tab_helper()->GetBookmarkDragDelegate()->OnDragOver(
+      bookmark_tab_helper_->GetBookmarkDragDelegate()->OnDragOver(
           bookmark_drag_data);
   }
 }
 
 void WebDragBookmarkHandlerWin::OnDragEnter(IDataObject* data_object) {
-  // This is non-null if web_contents_ is showing an ExtensionWebUI with
+  // This is non-null if the web_contents_ is showing an ExtensionWebUI with
   // support for (at the moment experimental) drag and drop extensions.
-  if (tab_ && tab_->bookmark_tab_helper()->GetBookmarkDragDelegate()) {
+  if (bookmark_tab_helper_ && bookmark_tab_helper_->GetBookmarkDragDelegate()) {
     ui::OSExchangeData os_exchange_data(
         new ui::OSExchangeDataProviderWin(data_object));
     BookmarkNodeData bookmark_drag_data;
     if (bookmark_drag_data.Read(os_exchange_data))
-      tab_->bookmark_tab_helper()->GetBookmarkDragDelegate()->OnDragEnter(
+      bookmark_tab_helper_->GetBookmarkDragDelegate()->OnDragEnter(
           bookmark_drag_data);
   }
 }
 
 void WebDragBookmarkHandlerWin::OnDrop(IDataObject* data_object) {
-  // This is non-null if tab_contents_ is showing an ExtensionWebUI with
+  // This is non-null if the web_contents_ is showing an ExtensionWebUI with
   // support for (at the moment experimental) drag and drop extensions.
-  if (tab_) {
-    if (tab_->bookmark_tab_helper()->GetBookmarkDragDelegate()) {
+  if (bookmark_tab_helper_) {
+    if (bookmark_tab_helper_->GetBookmarkDragDelegate()) {
       ui::OSExchangeData os_exchange_data(
           new ui::OSExchangeDataProviderWin(data_object));
       BookmarkNodeData bookmark_drag_data;
       if (bookmark_drag_data.Read(os_exchange_data)) {
-        tab_->bookmark_tab_helper()->GetBookmarkDragDelegate()->OnDrop(
+        bookmark_tab_helper_->GetBookmarkDragDelegate()->OnDrop(
             bookmark_drag_data);
       }
     }
 
     // Focus the target browser.
-    Browser* browser = browser::FindBrowserWithWebContents(
-        tab_->web_contents());
+    Browser* browser = browser::FindBrowserWithWebContents(web_contents_);
     if (browser)
       browser->window()->Show();
   }
 }
 
 void WebDragBookmarkHandlerWin::OnDragLeave(IDataObject* data_object) {
-  if (tab_ && tab_->bookmark_tab_helper()->GetBookmarkDragDelegate()) {
+  if (bookmark_tab_helper_ && bookmark_tab_helper_->GetBookmarkDragDelegate()) {
     ui::OSExchangeData os_exchange_data(
         new ui::OSExchangeDataProviderWin(data_object));
     BookmarkNodeData bookmark_drag_data;
     if (bookmark_drag_data.Read(os_exchange_data))
-      tab_->bookmark_tab_helper()->GetBookmarkDragDelegate()->OnDragLeave(
+      bookmark_tab_helper_->GetBookmarkDragDelegate()->OnDragLeave(
           bookmark_drag_data);
   }
 }
 
 bool WebDragBookmarkHandlerWin::AddDragData(const WebDropData& drop_data,
                                             ui::OSExchangeData* data) {
   if (!drop_data.url.SchemeIs(chrome::kJavaScriptScheme))
     return false;
 
   // We don't want to allow javascript URLs to be dragged to the desktop,
   // but we do want to allow them to be added to the bookmarks bar
   // (bookmarklets). So we create a fake bookmark entry (BookmarkNodeData
   // object) which explorer.exe cannot handle, and write the entry to data.
   BookmarkNodeData::Element bm_elt;
   bm_elt.is_url = true;
   bm_elt.url = drop_data.url;
   bm_elt.title = drop_data.url_title;
 
   BookmarkNodeData bm_drag_data;
   bm_drag_data.elements.push_back(bm_elt);
 
   // Pass in NULL as the profile so that the bookmark always adds the url
   // rather than trying to move an existing url.
   bm_drag_data.Write(NULL, data);
 
   return true;
 }