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

chrome/browser/ui/toolbar/toolbar_model.h

Index: chrome/browser/ui/toolbar/toolbar_model.h
===================================================================
--- chrome/browser/ui/toolbar/toolbar_model.h	(revision 116232)
+++ chrome/browser/ui/toolbar/toolbar_model.h	(working copy)
@@ -12,7 +12,10 @@
 #include "base/string16.h"
 
 class Browser;
+
+namespace content {
 class NavigationController;
+}
 
 namespace net {
 class X509Certificate;
@@ -70,7 +73,7 @@
   // Returns the navigation controller used to retrieve the navigation entry
   // from which the states are retrieved.
   // If this returns NULL, default values are used.
-  NavigationController* GetNavigationController() const;
+  content::NavigationController* GetNavigationController() const;
 
   Browser* browser_;