Split TabContentsViewMac.

chrome/browser/tab_contents/moving_to_content/tab_contents_view_mac.mm

 // 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.
 
 #import <Carbon/Carbon.h>
 
 #include "chrome/browser/tab_contents/moving_to_content/tab_contents_view_mac.h"
 
 #include <string>
 
 #import "base/mac/scoped_sending_event.h"
 #import "base/message_pump_mac.h"
-#import "chrome/browser/renderer_host/chrome_render_widget_host_view_mac_delegate.h"
-#include "chrome/browser/tab_contents/render_view_context_menu_mac.h"
-#include "chrome/browser/tab_contents/web_drag_bookmark_handler_mac.h"
-#import "chrome/browser/ui/cocoa/view_id_util.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/render_view_host_factory.h"
 #include "content/browser/renderer_host/render_widget_host.h"
 #include "content/browser/renderer_host/render_widget_host_view_mac.h"
 #include "content/browser/tab_contents/popup_menu_helper_mac.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #import "content/browser/tab_contents/web_drag_dest_mac.h"
 #import "content/browser/tab_contents/web_drag_source_mac.h"
 #include "content/common/view_messages.h"
+#include "content/public/browser/web_contents_view_mac_delegate.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "skia/ext/skia_utils_mac.h"
 #import "third_party/mozilla/NSPasteboard+Utils.h"
 #import "ui/base/cocoa/focus_tracker.h"
 
 using WebKit::WebDragOperation;
 using WebKit::WebDragOperationsMask;
 using content::WebContents;
 
 // Ensure that the WebKit::WebDragOperation enum values stay in sync with
@@ skipping 20 matching lines @@
 - (void)cancelDeferredClose;
 - (void)clearTabContentsView;
 - (void)closeTabAfterEvent;
 - (void)viewDidBecomeFirstResponder:(NSNotification*)notification;
 // Notify the RenderWidgetHost that the frame was updated so it can resize
 // its contents.
 - (void)renderWidgetHostWasResized;
 @end
 
 namespace tab_contents_view_mac {
-content::WebContentsView* CreateWebContentsView(WebContents* web_contents) {
-  return new TabContentsViewMac(web_contents);
+content::WebContentsView* CreateWebContentsView(
+    WebContents* web_contents,
+    content::WebContentsViewMacDelegate* delegate) {
+  return new TabContentsViewMac(web_contents, delegate);
 }
 }
 
-TabContentsViewMac::TabContentsViewMac(WebContents* web_contents)
+TabContentsViewMac::TabContentsViewMac(
+    WebContents* web_contents,
+    content::WebContentsViewMacDelegate* delegate)
     : tab_contents_(static_cast<TabContents*>(web_contents)),
+      delegate_(delegate),
       overlaid_view_(nil) {
 }
 
 TabContentsViewMac::~TabContentsViewMac() {
   // This handles the case where a renderer close call was deferred
   // while the user was operating a UI control which resulted in a
   // close.  In that case, the Cocoa view outlives the
   // TabContentsViewMac instance due to Cocoa retain count.
   [cocoa_view_ cancelDeferredClose];
   [cocoa_view_ clearTabContentsView];
@@ skipping 12 matching lines @@
     // test view, so we don't want to clobber it with a real one. To verify that
     // this actually is happening (and somebody isn't accidentally creating the
     // view twice), we check for the RVH Factory, which will be set when we're
     // making special ones (which go along with the special views).
     DCHECK(RenderViewHostFactory::has_factory());
     return render_widget_host->view();
   }
 
   RenderWidgetHostViewMac* view =
       new RenderWidgetHostViewMac(render_widget_host);
-
-  // TODO(avi): Find a better place to do this.
-  ChromeRenderWidgetHostViewMacDelegate* rw_delegate =
-      [[ChromeRenderWidgetHostViewMacDelegate alloc]
-          initWithRenderWidgetHost:render_widget_host];
-  view->SetDelegate(rw_delegate);
+  if (delegate()) {
+    NSObject<RenderWidgetHostViewMacDelegate>* rw_delegate =
+        delegate()->CreateRenderWidgetHostViewDelegate(render_widget_host);
+    view->SetDelegate(rw_delegate);
+  }
 
   // Fancy layout comes later; for now just make it our size and resize it
   // with us. In case there are other siblings of the content area, we want
   // to make sure the content area is on the bottom so other things draw over
   // it.
   NSView* view_view = view->GetNativeView();
   [view_view setFrame:[cocoa_view_.get() bounds]];
   [view_view setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
   // Add the new view below all other views; this also keeps it below any
   // overlay view installed.
@@ skipping 216 matching lines @@
 
   // A RenderWidgetHostViewMac has lifetime scoped to the view. Now that it's
   // properly embedded (or purposely ignored) we can release the retain we took
   // in CreateNewFullscreenWidgetInternal().
   RenderWidgetHostViewMac* widget_view_mac =
       static_cast<RenderWidgetHostViewMac*>(widget_host_view);
   [widget_view_mac->GetNativeView() release];
 }
 
 void TabContentsViewMac::ShowContextMenu(const ContextMenuParams& params) {
-  // The renderer may send the "show context menu" message multiple times, one
-  // for each right click mouse event it receives. Normally, this doesn't happen
-  // because mouse events are not forwarded once the context menu is showing.
-  // However, there's a race - the context menu may not yet be showing when
-  // the second mouse event arrives. In this case, |ShowContextMenu()| will
-  // get called multiple times - if so, don't create another context menu.
-  // TODO(asvitkine): Fix the renderer so that it doesn't do this.
-  RenderWidgetHostView* widget_view = tab_contents_->GetRenderWidgetHostView();
-  if (widget_view && widget_view->showing_context_menu())
-    return;
-
   // Allow delegates to handle the context menu operation first.
   if (tab_contents_->GetDelegate() &&
       tab_contents_->GetDelegate()->HandleContextMenu(params)) {
     return;
   }
 
-  context_menu_.reset(new RenderViewContextMenuMac(tab_contents(),
-                                                   params,
-                                                   GetContentNativeView()));
-  context_menu_->Init();
+  if (delegate())
+    delegate()->ShowContextMenu(params);
+  else
+    DLOG(ERROR) << "Implement context menus without chrome/ code";

[jochen (gone - plz use gerrit), 2012/02/03 00:13:33]

Aren't error messages with chrome/ in it also some kind of chrome dependency? :)

What about just NOTREACHED() or "Cannot show context menus without a delegate"
or similar?

[Avi (use Gerrit), 2012/02/03 01:18:53]

Stolen from the GTK version of this code :) Will change.

 }
 
 // Display a popup menu for WebKit using Cocoa widgets.
 void TabContentsViewMac::ShowPopupMenu(
     const gfx::Rect& bounds,
     int item_height,
     double item_font_size,
     int selected_item,
     const std::vector<WebMenuItem>& items,
     bool right_aligned) {
@@ skipping 41 matching lines @@
 }
 
 @implementation TabContentsViewCocoa
 
 - (id)initWithTabContentsViewMac:(TabContentsViewMac*)w {
   self = [super initWithFrame:NSZeroRect];
   if (self != nil) {
     tabContentsView_ = w;
     dragDest_.reset(
         [[WebDragDest alloc] initWithTabContents:[self tabContents]]);
-    bookmarkHandler_.reset(new WebDragBookmarkHandlerMac);
-    [dragDest_ setDragDelegate:
-        static_cast<content::WebDragDestDelegate*>(bookmarkHandler_.get())];
     [self registerDragTypes];
-    // TabContentsViewCocoa's ViewID may be changed to VIEW_ID_DEV_TOOLS_DOCKED
-    // by TabContentsController, so we can't just override -viewID method to
-    // return it.
-    view_id_util::SetID(self, VIEW_ID_TAB_CONTAINER);
 
     [[NSNotificationCenter defaultCenter]
          addObserver:self
             selector:@selector(viewDidBecomeFirstResponder:)
                 name:kViewDidBecomeFirstResponder
               object:nil];
+
+    if (tabContentsView_->delegate()) {
+      [dragDest_ setDragDelegate:tabContentsView_->delegate()->DragDelegate()];
+      tabContentsView_->delegate()->NativeViewCreated(self);
+    }
   }
   return self;
 }
 
 - (void)dealloc {
-  view_id_util::UnsetID(self);
+  if (tabContentsView_ && tabContentsView_->delegate())
+    tabContentsView_->delegate()->NativeViewDestroyed(self);
 
   // Cancel any deferred tab closes, just in case.
   [self cancelDeferredClose];
 
   // This probably isn't strictly necessary, but can't hurt.
   [self unregisterDraggedTypes];
 
   [[NSNotificationCenter defaultCenter] removeObserver:self];
 
   [super dealloc];
@@ skipping 155 matching lines @@
       [[[notification userInfo] objectForKey:kSelectionDirection]
         unsignedIntegerValue];
   if (direction == NSDirectSelection)
     return;
 
   [self tabContents]->
       FocusThroughTabTraversal(direction == NSSelectingPrevious);
 }
 
 @end