Move TabContentsViewGtk's delegate to content\public\browser. Also name it a delegate instead of a …

chrome/browser/ui/gtk/constrained_window_gtk.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/ui/gtk/constrained_window_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/constrained_window_tab_helper.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/base/gtk/gtk_compat.h"
 #include "ui/base/gtk/gtk_hig_constants.h"
 
 #if defined(TOOLKIT_VIEWS)
 #include "chrome/browser/ui/views/tab_contents/native_tab_contents_view_gtk.h"
 #include "chrome/browser/ui/views/tab_contents/tab_contents_view_views.h"
 #else
-#include "chrome/browser/tab_contents/chrome_tab_contents_view_wrapper_gtk.h"
+#include "chrome/browser/tab_contents/chrome_web_contents_view_gtk_delegate.h"
 #include "content/browser/tab_contents/tab_contents_view_gtk.h"
 #endif
 
 using content::BrowserThread;
 
 ConstrainedWindowGtkDelegate::~ConstrainedWindowGtkDelegate() {
 }
 
 bool ConstrainedWindowGtkDelegate::GetBackgroundColor(GdkColor* color) {
   return false;
@@ skipping 99 matching lines @@
 
 ConstrainedWindowGtk::TabContentsViewType*
     ConstrainedWindowGtk::ContainingView() {
 #if defined(TOOLKIT_VIEWS)
   return static_cast<NativeTabContentsViewGtk*>(
       static_cast<TabContentsViewViews*>(wrapper_->web_contents()->GetView())->
           native_tab_contents_view());
 #else
   return static_cast<TabContentsViewType*>(
       static_cast<content::TabContentsViewGtk*>(
-          wrapper_->web_contents()->GetView())->wrapper());
+          wrapper_->web_contents()->GetView())->delegate());
 #endif
 }
 
 gboolean ConstrainedWindowGtk::OnKeyPress(GtkWidget* sender,
                                           GdkEventKey* key) {
   if (key->keyval == GDK_Escape) {
     // Let the stack unwind so the event handler can release its ref
     // on widget().
     MessageLoop::current()->PostTask(
         FROM_HERE,
         base::Bind(&ConstrainedWindowGtk::CloseConstrainedWindow,
                    weak_factory_.GetWeakPtr()));
     return TRUE;
   }
 
   return FALSE;
 }
 
 void ConstrainedWindowGtk::OnHierarchyChanged(GtkWidget* sender,
                                               GtkWidget* previous_toplevel) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (!gtk_widget_is_toplevel(gtk_widget_get_toplevel(widget())))
     return;
 
   FocusConstrainedWindow();
 }