Rename NavigationController to NavigationControllerImpl and put it into the content namespace. Also make all users of content::NavigationController interface use the "using" keyword so they don't have to put content:: everywhere (similar to other Content API and WebKit API classes).

BUG=98716
TBR=joi
Review URL: http://codereview.chromium.org/8956059

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115916 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 4 deletions

diff --git a/content/browser/ssl/ssl_policy.h b/content/browser/ssl/ssl_policy.h
index 302207d..1cf0de1 100644
--- a/content/browser/ssl/ssl_policy.h
+++ b/content/browser/ssl/ssl_policy.h
@@ -10,12 +10,15 @@
 
 #include "webkit/glue/resource_type.h"
 
-class NavigationEntry;
 class SSLCertErrorHandler;
 class SSLPolicyBackend;
 class SSLRequestInfo;
 class TabContents;
 
+namespace content {
+class NavigationEntryImpl;
+}
+
 // SSLPolicy
 //
 // This class is responsible for making the security decisions that concern the
@@ -29,7 +32,7 @@ class SSLPolicy {
   // An error occurred with the certificate in an SSL connection.
   void OnCertError(SSLCertErrorHandler* handler);
 
-  void DidRunInsecureContent(NavigationEntry* entry,
+  void DidRunInsecureContent(content::NavigationEntryImpl* entry,
                              const std::string& security_origin);
 
   // We have started a resource request with the given info.
@@ -37,7 +40,8 @@ class SSLPolicy {
 
   // Update the SSL information in |entry| to match the current state.
   // |tab_contents| is the TabContents associated with this entry.
-  void UpdateEntry(NavigationEntry* entry, TabContents* tab_contents);
+  void UpdateEntry(content::NavigationEntryImpl* entry,
+                   TabContents* tab_contents);
 
   SSLPolicyBackend* backend() const { return backend_; }
 
@@ -54,7 +58,7 @@ class SSLPolicy {
 
   // If the security style of |entry| has not been initialized, then initialize
   // it with the default style for its URL.
-  void InitializeEntryIfNeeded(NavigationEntry* entry);
+  void InitializeEntryIfNeeded(content::NavigationEntryImpl* entry);
 
   // Mark |origin| as having run insecure content in the process with ID |pid|.
   void OriginRanInsecureContent(const std::string& origin, int pid);