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

chrome/browser/tab_contents/web_contents_view_mac.mm

 // Copyright (c) 2006-2008 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_mac.h"
 
 #include "chrome/browser/browser.h" // TODO(beng): this dependency is awful.
 #include "chrome/browser/cocoa/sad_tab_view.h"
 #include "chrome/browser/renderer_host/render_widget_host.h"
 #include "chrome/browser/renderer_host/render_widget_host_view_mac.h"
@@ skipping 16 matching lines @@
     : WebContentsView(web_contents) {
   registrar_.Add(this, NotificationType::WEB_CONTENTS_CONNECTED,
                  Source<WebContents>(web_contents));
   registrar_.Add(this, NotificationType::WEB_CONTENTS_DISCONNECTED,
                  Source<WebContents>(web_contents));
 }
 
 WebContentsViewMac::~WebContentsViewMac() {
 }
 
-WebContents* WebContentsViewMac::GetWebContents() {
-  return web_contents_;
-}
-
 void WebContentsViewMac::CreateView() {
   WebContentsViewCocoa* view =
       [[WebContentsViewCocoa alloc] initWithWebContentsViewMac:this];
   cocoa_view_.reset(view);
 }
 
 RenderWidgetHostView* WebContentsViewMac::CreateViewForWidget(
     RenderWidgetHost* render_widget_host) {
   DCHECK(!render_widget_host->view());
   RenderWidgetHostViewMac* view =
       new RenderWidgetHostViewMac(render_widget_host);
 
   // Fancy layout comes later; for now just make it our size and resize it
   // with us.
   NSView* view_view = view->native_view();
   [cocoa_view_.get() addSubview:view_view];
   [view_view setFrame:[cocoa_view_.get() bounds]];
   [view_view setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
 
   return view;
 }
 
 gfx::NativeView WebContentsViewMac::GetNativeView() const {
   return cocoa_view_.get();
 }
 
 gfx::NativeView WebContentsViewMac::GetContentNativeView() const {
-  if (!web_contents_->render_widget_host_view())
+  if (!web_contents()->render_widget_host_view())
     return NULL;
-  return web_contents_->render_widget_host_view()->GetPluginNativeView();
+  return web_contents()->render_widget_host_view()->GetPluginNativeView();
 }
 
 gfx::NativeWindow WebContentsViewMac::GetTopLevelNativeWindow() const {
   return [cocoa_view_.get() window];
 }
 
 void WebContentsViewMac::GetContainerBounds(gfx::Rect* out) const {
   *out = [cocoa_view_.get() NSRectToRect:[cocoa_view_.get() bounds]];
 }
 
@@ skipping 89 matching lines @@
                                      const gfx::Rect& selection_rect,
                                      int active_match_ordinal,
                                      bool final_update) {
   if (find_bar_.get()) {
     find_bar_->OnFindReply(request_id, number_of_matches, selection_rect,
                            active_match_ordinal, final_update);
   }
 }
 
 void WebContentsViewMac::ShowContextMenu(const ContextMenuParams& params) {
-  RenderViewContextMenuMac menu(web_contents_,
+  RenderViewContextMenuMac menu(web_contents(),
                                 params,
                                 GetNativeView());
 }
 
 WebContents* WebContentsViewMac::CreateNewWindowInternal(
     int route_id,
     base::WaitableEvent* modal_dialog_event) {
   // Create the new web contents. This will automatically create the new
   // WebContentsView. In the future, we may want to create the view separately.
   WebContents* new_contents =
-      new WebContents(web_contents_->profile(),
-                      web_contents_->GetSiteInstance(),
-                      web_contents_->render_view_factory_,
+      new WebContents(web_contents()->profile(),
+                      web_contents()->GetSiteInstance(),
+                      web_contents()->render_view_factory_,
                       route_id,
                       modal_dialog_event);
-  new_contents->SetupController(web_contents_->profile());
+  new_contents->SetupController(web_contents()->profile());
   WebContentsView* new_view = new_contents->view();
 
   new_view->CreateView();
 
   // TODO(brettw) it seems bogus that we have to call this function on the
   // newly created object and give it one of its own member variables.
   new_view->CreateViewForWidget(new_contents->render_view_host());
   return new_contents;
 }
 
 void WebContentsViewMac::ShowCreatedWindowInternal(
     WebContents* new_web_contents,
     WindowOpenDisposition disposition,
     const gfx::Rect& initial_pos,
     bool user_gesture) {
   if (!new_web_contents->render_widget_host_view() ||
       !new_web_contents->process()->channel()) {
     // The view has gone away or the renderer crashed. Nothing to do.
     return;
   }
 
   // TODO(brettw) this seems bogus to reach into here and initialize the host.
   new_web_contents->render_view_host()->Init();
-  web_contents_->AddNewContents(new_web_contents, disposition, initial_pos,
-                                user_gesture);
+  web_contents()->AddNewContents(new_web_contents, disposition, initial_pos,
+                                 user_gesture);
 }
 
 void WebContentsViewMac::Observe(NotificationType type,
                                  const NotificationSource& source,
                                  const NotificationDetails& details) {
   switch (type.value) {
     case NotificationType::WEB_CONTENTS_CONNECTED: {
       if (sad_tab_.get()) {
         [sad_tab_.get() removeFromSuperview];
         sad_tab_.reset();
@@ skipping 26 matching lines @@
 }
 
 - (void)processKeyboardEvent:(NSEvent*)event {
   if ([event type] == NSKeyDown)
     [super keyDown:event];
   else if ([event type] == NSKeyUp)
     [super keyUp:event];
 }
 
 - (void)mouseEvent:(NSEvent *)theEvent {
-  if (webContentsView_->GetWebContents()->delegate()) {
+  if (webContentsView_->web_contents()->delegate()) {
     if ([theEvent type] == NSMouseMoved)
-      webContentsView_->GetWebContents()->delegate()->
-          ContentsMouseEvent(webContentsView_->GetWebContents(), true);
+      webContentsView_->web_contents()->delegate()->
+          ContentsMouseEvent(webContentsView_->web_contents(), true);
     if ([theEvent type] == NSMouseExited)
-      webContentsView_->GetWebContents()->delegate()->
-          ContentsMouseEvent(webContentsView_->GetWebContents(), false);
+      webContentsView_->web_contents()->delegate()->
+          ContentsMouseEvent(webContentsView_->web_contents(), false);
   }
 }
 
 // In the Windows version, we always have cut/copy/paste enabled. This is sub-
 // optimal, but we do it too. TODO(avi): Plumb the "can*" methods up from
 // WebCore.
 
 - (void)cut:(id)sender {
-  webContentsView_->GetWebContents()->Cut();
+  webContentsView_->web_contents()->Cut();
 }
 
 - (void)copy:(id)sender {
-  webContentsView_->GetWebContents()->Copy();
+  webContentsView_->web_contents()->Copy();
 }
 
 - (void)paste:(id)sender {
-  webContentsView_->GetWebContents()->Paste();
+  webContentsView_->web_contents()->Paste();
 }
 
 // Tons of stuff goes here, where we grab events going on in Cocoaland and send
 // them into the C++ system. TODO(avi): all that jazz
 
 @end