Rename NavigationController to NavigationControllerImpl and put it into the content namespace. Al...

chrome/browser/translate/options_menu_model.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/translate/options_menu_model.h"
 
 #include "base/metrics/histogram.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/translate/translate_infobar_delegate.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "ui/base/l10n/l10n_util.h"
 
+using content::NavigationEntry;
 using content::OpenURLParams;
 using content::Referrer;
 using content::WebContents;
 
 namespace {
 
 const char kAboutGoogleTranslateUrl[] =
 #if defined(OS_CHROMEOS)
     "https://www.google.com/support/chromeos/bin/answer.py?answer=173424";
 #else
@@ skipping 64 matching lines @@
     case IDC_TRANSLATE_OPTIONS_ALWAYS :
       return (!translate_infobar_delegate_->IsLanguageBlacklisted() &&
           !translate_infobar_delegate_->IsSiteBlacklisted());
 
     case IDC_TRANSLATE_REPORT_BAD_LANGUAGE_DETECTION : {
       // Until we have a secure URL for reporting language detection errors,
       // we don't report errors that happened on secure URLs.
       DCHECK(translate_infobar_delegate_ != NULL);
       DCHECK(translate_infobar_delegate_->owner() != NULL);
       DCHECK(translate_infobar_delegate_->owner()->web_contents() != NULL);
-      content::NavigationEntry* entry = translate_infobar_delegate_->owner()->
+      NavigationEntry* entry = translate_infobar_delegate_->owner()->
           web_contents()->GetController().GetActiveEntry();
       // Delegate and tab contents should never be NULL, but active entry
       // can be NULL when running tests. We want to return false if NULL.
       return (entry != NULL) && !entry->GetURL().SchemeIsSecure();
     }
     default:
       break;
   }
   return true;
 }
@@ skipping 36 matching lines @@
         web_contents->OpenURL(params);
       }
       break;
     }
 
     default:
       NOTREACHED() << "Invalid command id from menu.";
       break;
   }
 }