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

chrome/browser/ui/auto_login_prompter.cc

 // 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.
 
 #include "chrome/browser/ui/auto_login_prompter.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 34 matching lines @@
 
 // AutoLoginRedirector --------------------------------------------------------
 
 // This class is created by the AutoLoginInfoBarDelegate when the user wishes to
 // auto-login.  It holds context information needed while re-issuing service
 // tokens using the TokenService, gets the browser cookies with the TokenAuth
 // API, and finally redirects the user to the correct page.
 class AutoLoginRedirector : public content::NotificationObserver {
  public:
   AutoLoginRedirector(TokenService* token_service,
-                      NavigationController* navigation_controller,
+                      content::NavigationController* navigation_controller,
                       const std::string& args);
   virtual ~AutoLoginRedirector();
 
  private:
   // content::NotificationObserver override.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   // Redirect tab to MergeSession URL, logging the user in and navigating
   // to the desired page.
   void RedirectToMergeSession(const std::string& token);
 
-  NavigationController* navigation_controller_;
+  content::NavigationController* navigation_controller_;
   const std::string args_;
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(AutoLoginRedirector);
 };
 
 AutoLoginRedirector::AutoLoginRedirector(
     TokenService* token_service,
-    NavigationController* navigation_controller,
+    content::NavigationController* navigation_controller,
     const std::string& args)
     : navigation_controller_(navigation_controller),
       args_(args) {
   // Register to receive notification for new tokens and then force the tokens
   // to be re-issued.  The token service guarantees to fire either
   // TOKEN_AVAILABLE or TOKEN_REQUEST_FAILED, so we will get at least one or
   // the other, allow AutoLoginRedirector to delete itself correctly.
   registrar_.Add(this,
                  chrome::NOTIFICATION_TOKEN_AVAILABLE,
                  content::Source<TokenService>(token_service));
@@ skipping 45 matching lines @@
       std::string());
 }
 
 
 // AutoLoginInfoBarDelegate ---------------------------------------------------
 
 // This is the actual infobar displayed to prompt the user to auto-login.
 class AutoLoginInfoBarDelegate : public ConfirmInfoBarDelegate {
  public:
   AutoLoginInfoBarDelegate(InfoBarTabHelper* owner,
-                           NavigationController* navigation_controller,
+                           content::NavigationController* navigation_controller,
                            TokenService* token_service,
                            PrefService* pref_service,
                            const std::string& username,
                            const std::string& args);
   virtual ~AutoLoginInfoBarDelegate();
 
  private:
   // ConfirmInfoBarDelegate overrides.
   virtual gfx::Image* GetIcon() const OVERRIDE;
   virtual Type GetInfoBarType() const OVERRIDE;
   virtual string16 GetMessageText() const OVERRIDE;
   virtual string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
   virtual bool Accept() OVERRIDE;
   virtual bool Cancel() OVERRIDE;
 
-  NavigationController* navigation_controller_;
+  content::NavigationController* navigation_controller_;
   TokenService* token_service_;
   PrefService* pref_service_;
   std::string username_;
   std::string args_;
 
   DISALLOW_COPY_AND_ASSIGN(AutoLoginInfoBarDelegate);
 };
 
 AutoLoginInfoBarDelegate::AutoLoginInfoBarDelegate(
     InfoBarTabHelper* owner,
-    NavigationController* navigation_controller,
+    content::NavigationController* navigation_controller,
     TokenService* token_service,
     PrefService* pref_service,
     const std::string& username,
     const std::string& args)
     : ConfirmInfoBarDelegate(owner),
       navigation_controller_(navigation_controller),
       token_service_(token_service),
       pref_service_(pref_service),
       username_(username),
       args_(args) {
@@ skipping 154 matching lines @@
           infobar_helper, &web_contents_->GetController(),
           profile->GetTokenService(), profile->GetPrefs(),
           username_, args_));
     }
   }
   // Either we couldn't add the infobar, we added the infobar, or the tab
   // contents was destroyed before the navigation completed.  In any case
   // there's no reason to live further.
   delete this;
 }