Convert WebContents to return a content::NavigationController instead of the implementation. Upda...

chrome/browser/ui/cocoa/applescript/tab_applescript.mm

 // Copyright (c) 2011 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 "chrome/browser/ui/cocoa/applescript/tab_applescript.h"
 
 #import <Carbon/Carbon.h>
 #import <Foundation/NSAppleEventDescriptor.h>
 
 #include "base/file_path.h"
 #include "base/logging.h"
 #import "base/memory/scoped_nsobject.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/printing/print_view_manager.h"
 #include "chrome/browser/sessions/restore_tab_helper.h"
 #include "chrome/browser/sessions/session_id.h"
 #include "chrome/browser/ui/cocoa/applescript/error_applescript.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/download/save_package.h"
 #include "content/browser/renderer_host/render_view_host.h"
-#include "content/browser/tab_contents/navigation_controller.h"
 #include "content/browser/tab_contents/tab_contents.h"
+#include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "googleurl/src/gurl.h"
 
 using content::NavigationEntry;
 using content::OpenURLParams;
 using content::Referrer;
 
 @interface AnyResultValue : NSObject {
  @private
@@ skipping 266 matching lines @@
   RenderViewHost* view = tabContents_->tab_contents()->GetRenderViewHost();
   if (!view) {
     NOTREACHED();
     return;
   }
 
   view->SelectAll();
 }
 
 - (void)handlesGoBackScriptCommand:(NSScriptCommand*)command {
-  NavigationController& navigationController =
+  content::NavigationController& navigationController =
       tabContents_->tab_contents()->GetController();
   if (navigationController.CanGoBack())
     navigationController.GoBack();
 }
 
 - (void)handlesGoForwardScriptCommand:(NSScriptCommand*)command {
-  NavigationController& navigationController =
+  content::NavigationController& navigationController =
       tabContents_->tab_contents()->GetController();
   if (navigationController.CanGoForward())
     navigationController.GoForward();
 }
 
 - (void)handlesReloadScriptCommand:(NSScriptCommand*)command {
-  NavigationController& navigationController =
+  content::NavigationController& navigationController =
       tabContents_->tab_contents()->GetController();
   const bool checkForRepost = true;
   navigationController.Reload(checkForRepost);
 }
 
 - (void)handlesStopScriptCommand:(NSScriptCommand*)command {
   RenderViewHost* view = tabContents_->tab_contents()->GetRenderViewHost();
   if (!view) {
     // We tolerate Stop being called even before a view has been created.
     // So just log a warning instead of a NOTREACHED().
@@ skipping 76 matching lines @@
   }
 
   string16 script = base::SysNSStringToUTF16(
       [[command evaluatedArguments] objectForKey:@"javascript"]);
   Value* value = view->ExecuteJavascriptAndGetValue(string16(), script);
   NSAppleEventDescriptor* descriptor = valueToDescriptor(value);
   return [[[AnyResultValue alloc] initWithDescriptor:descriptor] autorelease];
 }
 
 @end