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

chrome/browser/translate/translate_manager.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/translate_manager.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/json/json_reader.h"
@@ skipping 30 matching lines @@
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/common/url_fetcher.h"
 #include "grit/browser_resources.h"
 #include "net/base/escape.h"
 #include "net/url_request/url_request_status.h"
 #include "ui/base/resource/resource_bundle.h"
 
+using content::NavigationEntry;
 using content::WebContents;
 
 namespace {
 
 // The list of languages the Google translation server supports.
 // For information, here is the list of languages that Chrome can be run in
 // but that the translation server does not support:
 // am Amharic
 // bn Bengali
 // gu Gujarati
@@ skipping 194 matching lines @@
 
 void TranslateManager::Observe(int type,
                                const content::NotificationSource& source,
                                const content::NotificationDetails& details) {
   switch (type) {
     case content::NOTIFICATION_NAV_ENTRY_COMMITTED: {
       NavigationController* controller =
           content::Source<NavigationController>(source).ptr();
       content::LoadCommittedDetails* load_details =
           content::Details<content::LoadCommittedDetails>(details).ptr();
-      content::NavigationEntry* entry = controller->GetActiveEntry();
+      NavigationEntry* entry = controller->GetActiveEntry();
       if (!entry) {
         NOTREACHED();
         return;
       }
 
       TabContentsWrapper* wrapper =
           TabContentsWrapper::GetCurrentWrapperForContents(
               controller->tab_contents());
       if (!wrapper || !wrapper->translate_tab_helper())
         return;
@@ skipping 119 matching lines @@
     std::vector<PendingRequest>::const_iterator iter;
     for (iter = pending_requests_.begin(); iter != pending_requests_.end();
          ++iter) {
       const PendingRequest& request = *iter;
       TabContents* tab = tab_util::GetTabContentsByID(request.render_process_id,
                                                       request.render_view_id);
       if (!tab) {
         // The tab went away while we were retrieving the script.
         continue;
       }
-      content::NavigationEntry* entry = tab->GetController().GetActiveEntry();
+      NavigationEntry* entry = tab->GetController().GetActiveEntry();
       if (!entry || entry->GetPageID() != request.page_id) {
         // We navigated away from the page the translation was triggered on.
         continue;
       }
 
       if (error) {
         TabContentsWrapper* wrapper =
             TabContentsWrapper::GetCurrentWrapperForContents(tab);
         InfoBarTabHelper* infobar_helper = wrapper->infobar_tab_helper();
         ShowInfoBar(
@@ skipping 45 matching lines @@
   Profile* profile = Profile::FromBrowserContext(tab->GetBrowserContext());
   PrefService* prefs = profile->GetOriginalProfile()->GetPrefs();
   if (!prefs->GetBoolean(prefs::kEnableTranslate))
     return;
 
   // Allow disabling of translate from the command line to assist with
   // automated browser testing.
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableTranslate))
     return;
 
-  content::NavigationEntry* entry = tab->GetController().GetActiveEntry();
+  NavigationEntry* entry = tab->GetController().GetActiveEntry();
   if (!entry) {
     // This can happen for popups created with window.open("").
     return;
   }
 
   // If there is already a translate infobar showing, don't show another one.
   if (GetTranslateInfoBarDelegate(tab))
     return;
 
   std::string target_lang = GetTargetLanguage(prefs);
@@ skipping 64 matching lines @@
       tab)->translate_tab_helper();
   if (helper->language_state().translation_pending())
     return;
 
   InitiateTranslation(tab, GetLanguageCode(page_lang));
 }
 
 void TranslateManager::TranslatePage(WebContents* web_contents,
                                      const std::string& source_lang,
                                      const std::string& target_lang) {
-  content::NavigationEntry* entry =
-      web_contents->GetController().GetActiveEntry();
+  NavigationEntry* entry = web_contents->GetController().GetActiveEntry();
   if (!entry) {
     NOTREACHED();
     return;
   }
 
   TabContentsWrapper* wrapper =
       TabContentsWrapper::GetCurrentWrapperForContents(web_contents);
   InfoBarTabHelper* infobar_helper = wrapper->infobar_tab_helper();
   ShowInfoBar(web_contents, TranslateInfoBarDelegate::CreateDelegate(
       TranslateInfoBarDelegate::TRANSLATING, infobar_helper,
@@ skipping 11 matching lines @@
   request.render_process_id = rvh->process()->GetID();
   request.render_view_id = rvh->routing_id();
   request.page_id = entry->GetPageID();
   request.source_lang = source_lang;
   request.target_lang = target_lang;
   pending_requests_.push_back(request);
   RequestTranslateScript();
 }
 
 void TranslateManager::RevertTranslation(WebContents* web_contents) {
-  content::NavigationEntry* entry =
-      web_contents->GetController().GetActiveEntry();
+  NavigationEntry* entry = web_contents->GetController().GetActiveEntry();
   if (!entry) {
     NOTREACHED();
     return;
   }
   web_contents->GetRenderViewHost()->Send(new ChromeViewMsg_RevertTranslation(
       web_contents->GetRenderViewHost()->routing_id(), entry->GetPageID()));
 
   TranslateTabHelper* helper = TabContentsWrapper::GetCurrentWrapperForContents(
       web_contents)->translate_tab_helper();
   helper->language_state().set_current_language(
@@ skipping 25 matching lines @@
     return;
   }
   browser->AddSelectedTabWithURL(GURL(report_error_url),
                                  content::PAGE_TRANSITION_AUTO_BOOKMARK);
 }
 
 void TranslateManager::DoTranslatePage(WebContents* tab,
                                        const std::string& translate_script,
                                        const std::string& source_lang,
                                        const std::string& target_lang) {
-  content::NavigationEntry* entry = tab->GetController().GetActiveEntry();
+  NavigationEntry* entry = tab->GetController().GetActiveEntry();
   if (!entry) {
     NOTREACHED();
     return;
   }
 
   TabContentsWrapper* wrapper =
       TabContentsWrapper::GetCurrentWrapperForContents(tab);
   if (!wrapper || !wrapper->translate_tab_helper())
     return;
 
@@ skipping 186 matching lines @@
   InfoBarTabHelper* infobar_helper = wrapper->infobar_tab_helper();
 
   for (size_t i = 0; i < infobar_helper->infobar_count(); ++i) {
     TranslateInfoBarDelegate* delegate =
         infobar_helper->GetInfoBarDelegateAt(i)->AsTranslateInfoBarDelegate();
     if (delegate)
       return delegate;
   }
   return NULL;
 }