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

content/public/browser/web_contents.h

 // 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.
 
 #ifndef CONTENT_PUBLIC_BROWSER_WEB_CONTENTS_H_
 #define CONTENT_PUBLIC_BROWSER_WEB_CONTENTS_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/process_util.h"
 #include "base/string16.h"
 #include "content/browser/download/save_package.h"
 #include "content/browser/webui/web_ui.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/page_navigator.h"
 #include "content/public/common/view_type.h"
 #include "ui/gfx/native_widget_types.h"
 #include "webkit/glue/window_open_disposition.h"
 
 class InterstitialPage;
-class NavigationController;
 class RenderViewHost;
 class RenderViewHostManager;
 class RenderWidgetHostView;
 class SessionStorageNamespace;
 class SiteInstance;
 // TODO(jam): of course we will have to rename TabContentsView etc to use
 // WebContents.
 class TabContentsView;
 
 namespace base {
 class PropertyBag;
 class TimeTicks;
 }
 
 namespace gfx {
 class Rect;
 }
 
 namespace net {
 struct LoadStateWithParam;
 }
 
 namespace content {
 
 class BrowserContext;
+class NavigationController;
 class RenderProcessHost;
 class WebContentsDelegate;
 struct RendererPreferences;
 struct SSLStatus;
 
 // Describes what goes in the main content area of a tab.
 class WebContents : public PageNavigator {
  public:
   // |base_tab_contents| is used if we want to size the new tab contents view
   // based on an existing tab contents view.  This can be NULL if not needed.
@@ skipping 17 matching lines @@
   // extra data they may wish to associate with the tab. Returns a pointer
   // rather than a reference since the PropertyAccessors expect this.
   virtual const base::PropertyBag* GetPropertyBag() const = 0;
   virtual base::PropertyBag* GetPropertyBag() = 0;
 
   // Gets/Sets the delegate.
   virtual WebContentsDelegate* GetDelegate() = 0;
   virtual void SetDelegate(WebContentsDelegate* delegate) = 0;
 
   // Gets the controller for this tab contents.
-  virtual ::NavigationController& GetController() = 0;
-  virtual const ::NavigationController& GetController() const = 0;
+  virtual NavigationController& GetController() = 0;
+  virtual const NavigationController& GetController() const = 0;
 
   // Returns the user browser context associated with this WebContents (via the
   // NavigationController).
   virtual content::BrowserContext* GetBrowserContext() const = 0;
 
   // Allows overriding the type of this tab.
   virtual void SetViewType(content::ViewType type) = 0;
   virtual content::ViewType GetViewType() const = 0;
 
   // Gets the URL that is currently being displayed, if there is one.
@@ skipping 256 matching lines @@
   // to see what it should do.
   virtual bool FocusLocationBarByDefault() = 0;
 
   // Focuses the location bar.
   virtual void SetFocusToLocationBar(bool select_all) = 0;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_WEB_CONTENTS_H_