bookmarks: Clean up the public API of BookmarkTabHelper.

R=sky@chromium.org


Review URL: https://chromiumcodereview.appspot.com/11569033

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173481 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 33 insertions, 33 deletions

diff --git a/chrome/browser/tab_contents/web_drag_bookmark_handler_aura.cc b/chrome/browser/tab_contents/web_drag_bookmark_handler_aura.cc
index c074236..0fa5f92 100644
--- a/chrome/browser/tab_contents/web_drag_bookmark_handler_aura.cc
+++ b/chrome/browser/tab_contents/web_drag_bookmark_handler_aura.cc
@@ -35,16 +35,16 @@ void WebDragBookmarkHandlerAura::DragInitialize(WebContents* contents) {
 }
 
 void WebDragBookmarkHandlerAura::OnDragOver() {
-  if (bookmark_tab_helper_ && bookmark_tab_helper_->GetBookmarkDragDelegate()) {
+  if (bookmark_tab_helper_ && bookmark_tab_helper_->bookmark_drag_delegate()) {
     if (bookmark_drag_data_.is_valid())
-      bookmark_tab_helper_->GetBookmarkDragDelegate()->OnDragOver(
+      bookmark_tab_helper_->bookmark_drag_delegate()->OnDragOver(
           bookmark_drag_data_);
   }
 }
 
 void WebDragBookmarkHandlerAura::OnReceiveDragData(
     const ui::OSExchangeData& data) {
-  if (bookmark_tab_helper_ && bookmark_tab_helper_->GetBookmarkDragDelegate()) {
+  if (bookmark_tab_helper_ && bookmark_tab_helper_->bookmark_drag_delegate()) {
     // Read the bookmark drag data and save it for use in later events in this
     // drag.
     bookmark_drag_data_.Read(data);
@@ -52,18 +52,18 @@ void WebDragBookmarkHandlerAura::OnReceiveDragData(
 }
 
 void WebDragBookmarkHandlerAura::OnDragEnter() {
-  if (bookmark_tab_helper_ && bookmark_tab_helper_->GetBookmarkDragDelegate()) {
+  if (bookmark_tab_helper_ && bookmark_tab_helper_->bookmark_drag_delegate()) {
     if (bookmark_drag_data_.is_valid())
-      bookmark_tab_helper_->GetBookmarkDragDelegate()->OnDragEnter(
+      bookmark_tab_helper_->bookmark_drag_delegate()->OnDragEnter(
           bookmark_drag_data_);
   }
 }
 
 void WebDragBookmarkHandlerAura::OnDrop() {
   if (bookmark_tab_helper_) {
-    if (bookmark_tab_helper_->GetBookmarkDragDelegate()) {
+    if (bookmark_tab_helper_->bookmark_drag_delegate()) {
       if (bookmark_drag_data_.is_valid()) {
-        bookmark_tab_helper_->GetBookmarkDragDelegate()->OnDrop(
+        bookmark_tab_helper_->bookmark_drag_delegate()->OnDrop(
             bookmark_drag_data_);
       }
     }
@@ -78,9 +78,9 @@ void WebDragBookmarkHandlerAura::OnDrop() {
 }
 
 void WebDragBookmarkHandlerAura::OnDragLeave() {
-  if (bookmark_tab_helper_ && bookmark_tab_helper_->GetBookmarkDragDelegate()) {
+  if (bookmark_tab_helper_ && bookmark_tab_helper_->bookmark_drag_delegate()) {
     if (bookmark_drag_data_.is_valid())
-      bookmark_tab_helper_->GetBookmarkDragDelegate()->OnDragLeave(
+      bookmark_tab_helper_->bookmark_drag_delegate()->OnDragLeave(
           bookmark_drag_data_);
   }
 
diff --git a/chrome/browser/tab_contents/web_drag_bookmark_handler_gtk.cc b/chrome/browser/tab_contents/web_drag_bookmark_handler_gtk.cc
index e22fd1d..3496e04 100644
--- a/chrome/browser/tab_contents/web_drag_bookmark_handler_gtk.cc
+++ b/chrome/browser/tab_contents/web_drag_bookmark_handler_gtk.cc
@@ -58,8 +58,8 @@ void WebDragBookmarkHandlerGtk::OnReceiveProcessedData(const GURL& url,
 }
 
 void WebDragBookmarkHandlerGtk::OnDragOver() {
-  if (bookmark_tab_helper_ && bookmark_tab_helper_->GetBookmarkDragDelegate()) {
-    bookmark_tab_helper_->GetBookmarkDragDelegate()->OnDragOver(
+  if (bookmark_tab_helper_ && bookmark_tab_helper_->bookmark_drag_delegate()) {
+    bookmark_tab_helper_->bookmark_drag_delegate()->OnDragOver(
         bookmark_drag_data_);
   }
 }
@@ -67,8 +67,8 @@ void WebDragBookmarkHandlerGtk::OnDragOver() {
 void WebDragBookmarkHandlerGtk::OnDragEnter() {
   // This is non-null if the web_contents_ is showing an ExtensionWebUI with
   // support for (at the moment experimental) drag and drop extensions.
-  if (bookmark_tab_helper_ && bookmark_tab_helper_->GetBookmarkDragDelegate()) {
-    bookmark_tab_helper_->GetBookmarkDragDelegate()->OnDragEnter(
+  if (bookmark_tab_helper_ && bookmark_tab_helper_->bookmark_drag_delegate()) {
+    bookmark_tab_helper_->bookmark_drag_delegate()->OnDragEnter(
         bookmark_drag_data_);
   }
 }
@@ -77,8 +77,8 @@ void WebDragBookmarkHandlerGtk::OnDrop() {
   // This is non-null if web_contents_ is showing an ExtensionWebUI with
   // support for (at the moment experimental) drag and drop extensions.
   if (bookmark_tab_helper_) {
-    if (bookmark_tab_helper_->GetBookmarkDragDelegate()) {
-      bookmark_tab_helper_->GetBookmarkDragDelegate()->OnDrop(
+    if (bookmark_tab_helper_->bookmark_drag_delegate()) {
+      bookmark_tab_helper_->bookmark_drag_delegate()->OnDrop(
           bookmark_drag_data_);
     }
 
@@ -90,8 +90,8 @@ void WebDragBookmarkHandlerGtk::OnDrop() {
 }
 
 void WebDragBookmarkHandlerGtk::OnDragLeave() {
-  if (bookmark_tab_helper_ && bookmark_tab_helper_->GetBookmarkDragDelegate()) {
-    bookmark_tab_helper_->GetBookmarkDragDelegate()->OnDragLeave(
+  if (bookmark_tab_helper_ && bookmark_tab_helper_->bookmark_drag_delegate()) {
+    bookmark_tab_helper_->bookmark_drag_delegate()->OnDragLeave(
         bookmark_drag_data_);
   }
 }
diff --git a/chrome/browser/tab_contents/web_drag_bookmark_handler_mac.mm b/chrome/browser/tab_contents/web_drag_bookmark_handler_mac.mm
index e7a9a7d..d1c7d91 100644
--- a/chrome/browser/tab_contents/web_drag_bookmark_handler_mac.mm
+++ b/chrome/browser/tab_contents/web_drag_bookmark_handler_mac.mm
@@ -28,15 +28,15 @@ void WebDragBookmarkHandlerMac::DragInitialize(WebContents* contents) {
 }
 
 void WebDragBookmarkHandlerMac::OnDragOver() {
-  if (bookmark_tab_helper_ && bookmark_tab_helper_->GetBookmarkDragDelegate()) {
-    bookmark_tab_helper_->GetBookmarkDragDelegate()->OnDragOver(
+  if (bookmark_tab_helper_ && bookmark_tab_helper_->bookmark_drag_delegate()) {
+    bookmark_tab_helper_->bookmark_drag_delegate()->OnDragOver(
         bookmark_drag_data_);
   }
 }
 
 void WebDragBookmarkHandlerMac::OnDragEnter() {
-  if (bookmark_tab_helper_ && bookmark_tab_helper_->GetBookmarkDragDelegate()) {
-    bookmark_tab_helper_->GetBookmarkDragDelegate()->OnDragEnter(
+  if (bookmark_tab_helper_ && bookmark_tab_helper_->bookmark_drag_delegate()) {
+    bookmark_tab_helper_->bookmark_drag_delegate()->OnDragEnter(
         bookmark_drag_data_);
   }
 }
@@ -45,8 +45,8 @@ void WebDragBookmarkHandlerMac::OnDrop() {
   // This is non-null if the web_contents_ is showing an ExtensionWebUI with
   // support for (at the moment experimental) drag and drop extensions.
   if (bookmark_tab_helper_) {
-    if (bookmark_tab_helper_->GetBookmarkDragDelegate()) {
-      bookmark_tab_helper_->GetBookmarkDragDelegate()->OnDrop(
+    if (bookmark_tab_helper_->bookmark_drag_delegate()) {
+      bookmark_tab_helper_->bookmark_drag_delegate()->OnDrop(
           bookmark_drag_data_);
     }
 
@@ -58,8 +58,8 @@ void WebDragBookmarkHandlerMac::OnDrop() {
 }
 
 void WebDragBookmarkHandlerMac::OnDragLeave() {
-  if (bookmark_tab_helper_ && bookmark_tab_helper_->GetBookmarkDragDelegate()) {
-    bookmark_tab_helper_->GetBookmarkDragDelegate()->OnDragLeave(
+  if (bookmark_tab_helper_ && bookmark_tab_helper_->bookmark_drag_delegate()) {
+    bookmark_tab_helper_->bookmark_drag_delegate()->OnDragLeave(
         bookmark_drag_data_);
   }
 }
diff --git a/chrome/browser/tab_contents/web_drag_bookmark_handler_win.cc b/chrome/browser/tab_contents/web_drag_bookmark_handler_win.cc
index 37172a8..fe9a018 100644
--- a/chrome/browser/tab_contents/web_drag_bookmark_handler_win.cc
+++ b/chrome/browser/tab_contents/web_drag_bookmark_handler_win.cc
@@ -37,12 +37,12 @@ void WebDragBookmarkHandlerWin::DragInitialize(WebContents* contents) {
 }
 
 void WebDragBookmarkHandlerWin::OnDragOver(IDataObject* data_object) {
-  if (bookmark_tab_helper_ && bookmark_tab_helper_->GetBookmarkDragDelegate()) {
+  if (bookmark_tab_helper_ && bookmark_tab_helper_->bookmark_drag_delegate()) {
     ui::OSExchangeData os_exchange_data(
         new ui::OSExchangeDataProviderWin(data_object));
     BookmarkNodeData bookmark_drag_data;
     if (bookmark_drag_data.Read(os_exchange_data))
-      bookmark_tab_helper_->GetBookmarkDragDelegate()->OnDragOver(
+      bookmark_tab_helper_->bookmark_drag_delegate()->OnDragOver(
           bookmark_drag_data);
   }
 }
@@ -50,12 +50,12 @@ void WebDragBookmarkHandlerWin::OnDragOver(IDataObject* data_object) {
 void WebDragBookmarkHandlerWin::OnDragEnter(IDataObject* data_object) {
   // This is non-null if the web_contents_ is showing an ExtensionWebUI with
   // support for (at the moment experimental) drag and drop extensions.
-  if (bookmark_tab_helper_ && bookmark_tab_helper_->GetBookmarkDragDelegate()) {
+  if (bookmark_tab_helper_ && bookmark_tab_helper_->bookmark_drag_delegate()) {
     ui::OSExchangeData os_exchange_data(
         new ui::OSExchangeDataProviderWin(data_object));
     BookmarkNodeData bookmark_drag_data;
     if (bookmark_drag_data.Read(os_exchange_data))
-      bookmark_tab_helper_->GetBookmarkDragDelegate()->OnDragEnter(
+      bookmark_tab_helper_->bookmark_drag_delegate()->OnDragEnter(
           bookmark_drag_data);
   }
 }
@@ -64,12 +64,12 @@ void WebDragBookmarkHandlerWin::OnDrop(IDataObject* data_object) {
   // This is non-null if the web_contents_ is showing an ExtensionWebUI with
   // support for (at the moment experimental) drag and drop extensions.
   if (bookmark_tab_helper_) {
-    if (bookmark_tab_helper_->GetBookmarkDragDelegate()) {
+    if (bookmark_tab_helper_->bookmark_drag_delegate()) {
       ui::OSExchangeData os_exchange_data(
           new ui::OSExchangeDataProviderWin(data_object));
       BookmarkNodeData bookmark_drag_data;
       if (bookmark_drag_data.Read(os_exchange_data)) {
-        bookmark_tab_helper_->GetBookmarkDragDelegate()->OnDrop(
+        bookmark_tab_helper_->bookmark_drag_delegate()->OnDrop(
             bookmark_drag_data);
       }
     }
@@ -82,12 +82,12 @@ void WebDragBookmarkHandlerWin::OnDrop(IDataObject* data_object) {
 }
 
 void WebDragBookmarkHandlerWin::OnDragLeave(IDataObject* data_object) {
-  if (bookmark_tab_helper_ && bookmark_tab_helper_->GetBookmarkDragDelegate()) {
+  if (bookmark_tab_helper_ && bookmark_tab_helper_->bookmark_drag_delegate()) {
     ui::OSExchangeData os_exchange_data(
         new ui::OSExchangeDataProviderWin(data_object));
     BookmarkNodeData bookmark_drag_data;
     if (bookmark_drag_data.Read(os_exchange_data))
-      bookmark_tab_helper_->GetBookmarkDragDelegate()->OnDragLeave(
+      bookmark_tab_helper_->bookmark_drag_delegate()->OnDragLeave(
           bookmark_drag_data);
   }
 }