TabContents -> WebContentsImpl, part 4.

content/browser/tab_contents/web_contents_view_mac.h

Index: content/browser/tab_contents/web_contents_view_mac.h
diff --git a/content/browser/tab_contents/web_contents_view_mac.h b/content/browser/tab_contents/web_contents_view_mac.h
deleted file mode 100644
index 5b80c0365e7801184e1e9dab0256635fe2f4b070..0000000000000000000000000000000000000000
--- a/content/browser/tab_contents/web_contents_view_mac.h
+++ /dev/null
@@ -1,157 +0,0 @@
-// 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.
-
-#ifndef CONTENT_BROWSER_TAB_CONTENTS_WEB_CONTENTS_VIEW_MAC_H_
-#define CONTENT_BROWSER_TAB_CONTENTS_WEB_CONTENTS_VIEW_MAC_H_
-#pragma once
-
-#if defined(__OBJC__)
-
-#import <Cocoa/Cocoa.h>
-
-#include <string>
-#include <vector>
-
-#include "base/memory/scoped_nsobject.h"
-#include "base/memory/scoped_ptr.h"
-#include "content/browser/tab_contents/tab_contents_view_helper.h"
-#include "content/public/browser/web_contents_view.h"
-#include "ui/base/cocoa/base_view.h"
-#include "ui/gfx/size.h"
-
-@class FocusTracker;
-class SkBitmap;
-class WebContentsViewMac;
-@class WebDragDest;
-@class WebDragSource;
-
-namespace content {
-class WebContentsViewDelegate;
-}
-
-namespace gfx {
-class Point;
-}
-
-@interface WebContentsViewCocoa : BaseView {
- @private
-  WebContentsViewMac* webContentsView_;  // WEAK; owns us
-  scoped_nsobject<WebDragSource> dragSource_;
-  scoped_nsobject<WebDragDest> dragDest_;
-}
-
-// Expose this, since sometimes one needs both the NSView and the
-// WebContentsImpl.
-- (WebContentsImpl*)webContents;
-@end
-
-// Mac-specific implementation of the WebContentsView. It owns an NSView that
-// contains all of the contents of the tab and associated child views.
-class WebContentsViewMac : public content::WebContentsView {
- public:
-  // The corresponding WebContentsImpl is passed in the constructor, and manages
-  // our lifetime. This doesn't need to be the case, but is this way currently
-  // because that's what was easiest when they were split.
-  WebContentsViewMac(WebContentsImpl* web_contents,
-                     content::WebContentsViewDelegate* delegate);
-  virtual ~WebContentsViewMac();
-
-  // WebContentsView implementation --------------------------------------------
-
-  virtual void CreateView(const gfx::Size& initial_size) OVERRIDE;
-  virtual content::RenderWidgetHostView* CreateViewForWidget(
-      content::RenderWidgetHost* render_widget_host) OVERRIDE;
-  virtual gfx::NativeView GetNativeView() const OVERRIDE;
-  virtual gfx::NativeView GetContentNativeView() const OVERRIDE;
-  virtual gfx::NativeWindow GetTopLevelNativeWindow() const OVERRIDE;
-  virtual void GetContainerBounds(gfx::Rect* out) const OVERRIDE;
-  virtual void RenderViewCreated(content::RenderViewHost* host) OVERRIDE;
-  virtual void SetPageTitle(const string16& title) OVERRIDE;
-  virtual void OnTabCrashed(base::TerminationStatus status,
-                            int error_code) OVERRIDE;
-  virtual void SizeContents(const gfx::Size& size) OVERRIDE;
-  virtual void Focus() OVERRIDE;
-  virtual void SetInitialFocus() OVERRIDE;
-  virtual void StoreFocus() OVERRIDE;
-  virtual void RestoreFocus() OVERRIDE;
-  virtual bool IsDoingDrag() const OVERRIDE;
-  virtual void CancelDragAndCloseTab() OVERRIDE;
-  virtual bool IsEventTracking() const OVERRIDE;
-  virtual void CloseTabAfterEventTracking() OVERRIDE;
-  virtual void GetViewBounds(gfx::Rect* out) const OVERRIDE;
-
-  // Backend implementation of RenderViewHostDelegate::View.
-  virtual void CreateNewWindow(
-      int route_id,
-      const ViewHostMsg_CreateWindow_Params& params) OVERRIDE;
-  virtual void CreateNewWidget(int route_id,
-                               WebKit::WebPopupType popup_type) OVERRIDE;
-  virtual void CreateNewFullscreenWidget(int route_id) OVERRIDE;
-  virtual void ShowCreatedWindow(int route_id,
-                                 WindowOpenDisposition disposition,
-                                 const gfx::Rect& initial_pos,
-                                 bool user_gesture) OVERRIDE;
-  virtual void ShowCreatedWidget(int route_id,
-                                 const gfx::Rect& initial_pos) OVERRIDE;
-  virtual void ShowCreatedFullscreenWidget(int route_id) OVERRIDE;
-  virtual void ShowContextMenu(
-      const content::ContextMenuParams& params) OVERRIDE;
-  virtual void ShowPopupMenu(const gfx::Rect& bounds,
-                             int item_height,
-                             double item_font_size,
-                             int selected_item,
-                             const std::vector<WebMenuItem>& items,
-                             bool right_aligned) OVERRIDE;
-  virtual void StartDragging(const WebDropData& drop_data,
-                             WebKit::WebDragOperationsMask allowed_operations,
-                             const SkBitmap& image,
-                             const gfx::Point& image_offset) OVERRIDE;
-  virtual void UpdateDragCursor(WebKit::WebDragOperation operation) OVERRIDE;
-  virtual void GotFocus() OVERRIDE;
-  virtual void TakeFocus(bool reverse) OVERRIDE;
-
-  // A helper method for closing the tab in the
-  // CloseTabAfterEventTracking() implementation.
-  void CloseTab();
-
-  WebContentsImpl* web_contents() { return web_contents_; }
-  content::WebContentsViewDelegate* delegate() { return delegate_.get(); }
-
- private:
-  // The WebContentsImpl whose contents we display.
-  WebContentsImpl* web_contents_;
-
-  // Common implementations of some WebContentsView methods.
-  TabContentsViewHelper tab_contents_view_helper_;
-
-  // The Cocoa NSView that lives in the view hierarchy.
-  scoped_nsobject<WebContentsViewCocoa> cocoa_view_;
-
-  // Keeps track of which NSView has focus so we can restore the focus when
-  // focus returns.
-  scoped_nsobject<FocusTracker> focus_tracker_;
-
-  // Our optional delegate.
-  scoped_ptr<content::WebContentsViewDelegate> delegate_;
-
-  DISALLOW_COPY_AND_ASSIGN(WebContentsViewMac);
-};
-
-#endif  // __OBJC__
-
-// Functions that may be accessed from non-Objective-C C/C++ code.
-namespace content {
-class WebContents;
-class WebContentsView;
-class WebContentsViewDelegate;
-}
-
-namespace web_contents_view_mac {
-// Creates a WebContentsViewMac. Takes ownership of |delegate|.
-CONTENT_EXPORT content::WebContentsView* CreateWebContentsView(
-    WebContentsImpl* web_contents,
-    content::WebContentsViewDelegate* delegate);
-}
-
-#endif  // CONTENT_BROWSER_TAB_CONTENTS_WEB_CONTENTS_VIEW_MAC_H_