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

chrome/browser/ui/toolbar/toolbar_model.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 CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_MODEL_H_
 #define CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_MODEL_H_
 #pragma once
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/string16.h"
 
 class Browser;
+
+namespace content {
 class NavigationController;
+}
 
 namespace net {
 class X509Certificate;
 }
 
 // This class is the model used by the toolbar, location bar and autocomplete
 // edit.  It populates its states from the current navigation entry retrieved
 // from the navigation controller returned by GetNavigationController().
 class ToolbarModel {
  public:
@@ skipping 37 matching lines @@
   void set_input_in_progress(bool value) { input_in_progress_ = value; }
   bool input_in_progress() const { return input_in_progress_; }
 
   // Returns "<organization_name> [<country>]".
   static string16 GetEVCertName(const net::X509Certificate& cert);
 
  private:
   // 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_;
 
   // Whether the text in the location bar is currently being edited.
   bool input_in_progress_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarModel);
 };
 
 #endif  // CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_MODEL_H_