| Index: chrome/browser/ui/auto_login_prompter.cc
 | 
| ===================================================================
 | 
| --- chrome/browser/ui/auto_login_prompter.cc	(revision 116288)
 | 
| +++ chrome/browser/ui/auto_login_prompter.cc	(working copy)
 | 
| @@ -41,6 +41,7 @@
 | 
|  #include "ui/base/resource/resource_bundle.h"
 | 
|  
 | 
|  using content::BrowserThread;
 | 
| +using content::NavigationController;
 | 
|  using content::WebContents;
 | 
|  
 | 
|  // AutoLoginRedirector --------------------------------------------------------
 | 
| @@ -52,7 +53,7 @@
 | 
|  class AutoLoginRedirector : public content::NotificationObserver {
 | 
|   public:
 | 
|    AutoLoginRedirector(TokenService* token_service,
 | 
| -                      content::NavigationController* navigation_controller,
 | 
| +                      NavigationController* navigation_controller,
 | 
|                        const std::string& args);
 | 
|    virtual ~AutoLoginRedirector();
 | 
|  
 | 
| @@ -66,7 +67,7 @@
 | 
|    // to the desired page.
 | 
|    void RedirectToMergeSession(const std::string& token);
 | 
|  
 | 
| -  content::NavigationController* navigation_controller_;
 | 
| +  NavigationController* navigation_controller_;
 | 
|    const std::string args_;
 | 
|    content::NotificationRegistrar registrar_;
 | 
|  
 | 
| @@ -75,7 +76,7 @@
 | 
|  
 | 
|  AutoLoginRedirector::AutoLoginRedirector(
 | 
|      TokenService* token_service,
 | 
| -    content::NavigationController* navigation_controller,
 | 
| +    NavigationController* navigation_controller,
 | 
|      const std::string& args)
 | 
|      : navigation_controller_(navigation_controller),
 | 
|        args_(args) {
 | 
| @@ -141,7 +142,7 @@
 | 
|  class AutoLoginInfoBarDelegate : public ConfirmInfoBarDelegate {
 | 
|   public:
 | 
|    AutoLoginInfoBarDelegate(InfoBarTabHelper* owner,
 | 
| -                           content::NavigationController* navigation_controller,
 | 
| +                           NavigationController* navigation_controller,
 | 
|                             TokenService* token_service,
 | 
|                             PrefService* pref_service,
 | 
|                             const std::string& username,
 | 
| @@ -157,7 +158,7 @@
 | 
|    virtual bool Accept() OVERRIDE;
 | 
|    virtual bool Cancel() OVERRIDE;
 | 
|  
 | 
| -  content::NavigationController* navigation_controller_;
 | 
| +  NavigationController* navigation_controller_;
 | 
|    TokenService* token_service_;
 | 
|    PrefService* pref_service_;
 | 
|    std::string username_;
 | 
| @@ -168,7 +169,7 @@
 | 
|  
 | 
|  AutoLoginInfoBarDelegate::AutoLoginInfoBarDelegate(
 | 
|      InfoBarTabHelper* owner,
 | 
| -    content::NavigationController* navigation_controller,
 | 
| +    NavigationController* navigation_controller,
 | 
|      TokenService* token_service,
 | 
|      PrefService* pref_service,
 | 
|      const std::string& username,
 | 
| @@ -226,7 +227,7 @@
 | 
|        username_(username),
 | 
|        args_(args) {
 | 
|    registrar_.Add(this, content::NOTIFICATION_LOAD_STOP,
 | 
| -                 content::Source<content::NavigationController>(
 | 
| +                 content::Source<NavigationController>(
 | 
|                      &web_contents_->GetController()));
 | 
|    registrar_.Add(this, content::NOTIFICATION_WEB_CONTENTS_DESTROYED,
 | 
|                   content::Source<WebContents>(web_contents_));
 | 
| 
 |