Move content\browser\web_contents to content namespace.

content/browser/web_contents/web_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>
 
 #import "content/browser/web_contents/web_contents_view_mac.h"
 
 #include <string>
 
@@ skipping 55 matching lines @@
 
 namespace content {
 WebContentsView* CreateWebContentsView(
     WebContentsImpl* web_contents,
     WebContentsViewDelegate* delegate,
     RenderViewHostDelegateView** render_view_host_delegate_view) {
   WebContentsViewMac* rv = new WebContentsViewMac(web_contents, delegate);
   *render_view_host_delegate_view = rv;
   return rv;
 }
-}
 
 WebContentsViewMac::WebContentsViewMac(
     WebContentsImpl* web_contents,

[tfarina, 2012/10/29 19:37:19]

will fit above now.

[jam, 2012/10/29 20:01:51]

Done.

-    content::WebContentsViewDelegate* delegate)
+    WebContentsViewDelegate* delegate)
     : web_contents_(web_contents),
       delegate_(delegate) {
 }
 
 WebContentsViewMac::~WebContentsViewMac() {
   // 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
   // WebContentsViewMac instance due to Cocoa retain count.
   [cocoa_view_ cancelDeferredClose];
   [cocoa_view_ clearWebContentsView];
 }
 
 void WebContentsViewMac::CreateView(const gfx::Size& initial_size) {
   WebContentsViewCocoa* view =
       [[WebContentsViewCocoa alloc] initWithWebContentsViewMac:this];
   cocoa_view_.reset(view);
 }
 
 RenderWidgetHostView* WebContentsViewMac::CreateViewForWidget(
-    content::RenderWidgetHost* render_widget_host) {
+    RenderWidgetHost* render_widget_host) {
   if (render_widget_host->GetView()) {
     // During testing, the view will already be set up in most cases to the
     // 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->GetView();
   }
 
@@ skipping 74 matching lines @@
   // processing events.
   MessageLoop::ScopedNestableTaskAllower allow(MessageLoop::current());
   NSDragOperation mask = static_cast<NSDragOperation>(allowed_operations);
   NSPoint offset = NSPointFromCGPoint(image_offset.ToCGPoint());
   [cocoa_view_ startDragWithDropData:drop_data
                    dragOperationMask:mask
                                image:gfx::NSImageFromImageSkia(image)
                               offset:offset];
 }
 
-void WebContentsViewMac::RenderViewCreated(content::RenderViewHost* host) {
+void WebContentsViewMac::RenderViewCreated(RenderViewHost* host) {
   // We want updates whenever the intrinsic width of the webpage changes.
   // Put the RenderView into that mode. The preferred width is used for example
   // when the "zoom" button in the browser window is clicked.
   host->EnablePreferredSizeMode();
 }
 
 void WebContentsViewMac::SetPageTitle(const string16& title) {
   // Meaningless on the Mac; widgets don't have a "title" attribute
 }
 
@@ skipping 66 matching lines @@
 // iterated past the last focusable element on the page).
 void WebContentsViewMac::TakeFocus(bool reverse) {
   if (reverse) {
     [[cocoa_view_ window] selectPreviousKeyView:cocoa_view_.get()];
   } else {
     [[cocoa_view_ window] selectNextKeyView:cocoa_view_.get()];
   }
 }
 
 void WebContentsViewMac::ShowContextMenu(
-    const content::ContextMenuParams& params,
-    content::ContextMenuSourceType type) {
+    const ContextMenuParams& params,

[tfarina, 2012/10/29 19:37:19]

can be moved above now.

[jam, 2012/10/29 20:01:51]

Done.

+    ContextMenuSourceType type) {
   // Allow delegates to handle the context menu operation first.
   if (web_contents_->GetDelegate() &&
       web_contents_->GetDelegate()->HandleContextMenu(params)) {
     return;
   }
 
   if (delegate())
     delegate()->ShowContextMenu(params, type);
   else
     DLOG(ERROR) << "Cannot show context menus without a delegate.";
@@ skipping 32 matching lines @@
 gfx::Rect WebContentsViewMac::GetViewBounds() const {
   // This method is not currently used on mac.
   NOTIMPLEMENTED();
   return gfx::Rect();
 }
 
 void WebContentsViewMac::CloseTab() {
   web_contents_->Close(web_contents_->GetRenderViewHost());
 }
 
+}  // namespace content
+
 @implementation WebContentsViewCocoa
 
 - (id)initWithWebContentsViewMac:(WebContentsViewMac*)w {
   self = [super initWithFrame:NSZeroRect];
   if (self != nil) {
     webContentsView_ = w;
     dragDest_.reset(
         [[WebDragDest alloc] initWithWebContentsImpl:[self webContents]]);
     [self registerDragTypes];
 
@@ skipping 183 matching lines @@
       [[[notification userInfo] objectForKey:kSelectionDirection]
         unsignedIntegerValue];
   if (direction == NSDirectSelection)
     return;
 
   [self webContents]->
       FocusThroughTabTraversal(direction == NSSelectingPrevious);
 }
 
 @end