WebContentsView became more than just an interface with 48103 (r12483). If we...

chrome/browser/tab_contents/web_contents_view_gtk.cc

 // Copyright (c) 2009 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_contents_view_gtk.h"
 
 #include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
@@ skipping 55 matching lines @@
 
 WebContentsViewGtk::WebContentsViewGtk(WebContents* web_contents)
     : WebContentsView(web_contents),
       vbox_(gtk_vbox_new(FALSE, 0)) {
 }
 
 WebContentsViewGtk::~WebContentsViewGtk() {
   vbox_.Destroy();
 }
 
-WebContents* WebContentsViewGtk::GetWebContents() {
-  return web_contents_;
-}
-
 void WebContentsViewGtk::CreateView() {
   NOTIMPLEMENTED();
 }
 
 RenderWidgetHostView* WebContentsViewGtk::CreateViewForWidget(
     RenderWidgetHost* render_widget_host) {
   DCHECK(!render_widget_host->view());
   RenderWidgetHostViewGtk* view =
       new RenderWidgetHostViewGtk(render_widget_host);
   view->InitAsChild();
   content_view_ = view->native_view();
   g_signal_connect(content_view_, "focus",
-                   G_CALLBACK(OnFocus), web_contents_);
+                   G_CALLBACK(OnFocus), web_contents());
   g_signal_connect(view->native_view(), "leave-notify-event",
-                   G_CALLBACK(OnLeaveNotify), web_contents_);
+                   G_CALLBACK(OnLeaveNotify), web_contents());
   g_signal_connect(view->native_view(), "motion-notify-event",
-                   G_CALLBACK(OnMouseMove), web_contents_);
+                   G_CALLBACK(OnMouseMove), web_contents());
   gtk_widget_add_events(view->native_view(), GDK_LEAVE_NOTIFY_MASK |
                         GDK_POINTER_MOTION_MASK);
   gtk_container_foreach(GTK_CONTAINER(vbox_.get()), RemoveWidget, vbox_.get());
   gtk_box_pack_start(GTK_BOX(vbox_.get()), content_view_, TRUE, TRUE, 0);
   return view;
 }
 
 gfx::NativeView WebContentsViewGtk::GetNativeView() const {
   return vbox_.get();
 }
@@ skipping 40 matching lines @@
   NOTIMPLEMENTED();
 }
 
 bool WebContentsViewGtk::GetFindBarWindowInfo(gfx::Point* position,
                                               bool* fully_visible) const {
   NOTIMPLEMENTED();
   return false;
 }
 
 void WebContentsViewGtk::SetInitialFocus() {
-  if (web_contents_->FocusLocationBarByDefault())
-    web_contents_->delegate()->SetFocusToLocationBar();
+  if (web_contents()->FocusLocationBarByDefault())
+    web_contents()->delegate()->SetFocusToLocationBar();
   else
     gtk_widget_grab_focus(content_view_);
 }
 
 void WebContentsViewGtk::StoreFocus() {
   NOTIMPLEMENTED();
 }
 
 void WebContentsViewGtk::RestoreFocus() {
   // TODO(estade): implement this function.
   // For now just assume we are viewing the tab for the first time.
   SetInitialFocus();
   NOTIMPLEMENTED();
 }
 
 void WebContentsViewGtk::UpdateDragCursor(bool is_drop_target) {
   NOTIMPLEMENTED();
 }
 
 // This is called when we the renderer asks us to take focus back (i.e., it has
 // iterated past the last focusable element on the page).
 void WebContentsViewGtk::TakeFocus(bool reverse) {
-  web_contents_->delegate()->SetFocusToLocationBar();
+  web_contents()->delegate()->SetFocusToLocationBar();
 }
 
 void WebContentsViewGtk::HandleKeyboardEvent(
     const NativeWebKeyboardEvent& event) {
   // This may be an accelerator. Pass it on to GTK.
   GtkWindow* window = GetTopLevelNativeWindow();
   gtk_accel_groups_activate(G_OBJECT(window), event.os_event->keyval,
                             GdkModifierType(event.os_event->state));
 }
 
 void WebContentsViewGtk::OnFindReply(int request_id,
                                      int number_of_matches,
                                      const gfx::Rect& selection_rect,
                                      int active_match_ordinal,
                                      bool final_update) {
   NOTIMPLEMENTED();
 }
 
 void WebContentsViewGtk::ShowContextMenu(const ContextMenuParams& params) {
-  context_menu_.reset(new RenderViewContextMenuGtk(web_contents_, params));
+  context_menu_.reset(new RenderViewContextMenuGtk(web_contents(), params));
   context_menu_->Popup();
 }
 
 void WebContentsViewGtk::StartDragging(const WebDropData& drop_data) {
   NOTIMPLEMENTED();
 }
 
 WebContents* WebContentsViewGtk::CreateNewWindowInternal(
     int route_id,
     base::WaitableEvent* modal_dialog_event) {
   NOTIMPLEMENTED();
   return NULL;
 }
 
 void WebContentsViewGtk::ShowCreatedWindowInternal(
     WebContents* new_web_contents,
     WindowOpenDisposition disposition,
     const gfx::Rect& initial_pos,
     bool user_gesture) {
   NOTIMPLEMENTED();
 }