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

Unified Diff: chrome/browser/tab_contents/web_drag_bookmark_handler_gtk.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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/tab_contents/web_drag_bookmark_handler_gtk.cc
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 8f075c461024679a405aa8b4b5c64cfcc8ce0c46..1f80169b802afbf3e4afb8b4c7ebcd0e3e11d94e 100644
--- a/chrome/browser/tab_contents/web_drag_bookmark_handler_gtk.cc
+++ b/chrome/browser/tab_contents/web_drag_bookmark_handler_gtk.cc
@@ -9,7 +9,7 @@
#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/ui/tab_contents/tab_contents.h"
#include "chrome/browser/profiles/profile.h"
#include "content/public/browser/web_contents.h"
#include "ui/base/dragdrop/gtk_dnd_util.h"
@@ -25,13 +25,13 @@ WebDragBookmarkHandlerGtk::~WebDragBookmarkHandlerGtk() {}
void WebDragBookmarkHandlerGtk::DragInitialize(WebContents* contents) {
bookmark_drag_data_.Clear();
- // Ideally we would want to initialize the the TabContentsWrapper member in
+ // Ideally we would want to initialize the the TabContents member in
// the constructor. We cannot do that as the WebDragDestGtk object is
// created during the construction of the WebContents object. The
- // TabContentsWrapper is created much later.
+ // TabContents is created much later.
DCHECK(tab_ ? (tab_->web_contents() == contents) : true);
if (!tab_)
- tab_ = TabContentsWrapper::GetCurrentWrapperForContents(contents);
+ tab_ = TabContents::FromWebContents(contents);
}
GdkAtom WebDragBookmarkHandlerGtk::GetBookmarkTargetAtom() const {

Powered by Google App Engine
This is Rietveld 408576698