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

chrome/browser/ui/search_engines/search_engine_tab_helper.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/search_engines/search_engine_tab_helper.h"
 
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_fetcher.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/search_engines/template_url_fetcher_ui_callbacks.h"
 #include "chrome/common/render_messages.h"
 #include "content/public/browser/favicon_status.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/frame_navigate_params.h"
 
+using content::NavigationEntry;
 using content::WebContents;
 
 namespace {
 
 // Returns true if the entry's transition type is FORM_SUBMIT.
-bool IsFormSubmit(const content::NavigationEntry* entry) {
+bool IsFormSubmit(const NavigationEntry* entry) {
   return (content::PageTransitionStripQualifier(entry->GetTransitionType()) ==
           content::PAGE_TRANSITION_FORM_SUBMIT);
 }
 
 }  // namespace
 
 SearchEngineTabHelper::SearchEngineTabHelper(WebContents* web_contents)
     : content::WebContentsObserver(web_contents) {
   DCHECK(web_contents);
 }
@@ skipping 49 matching lines @@
     case search_provider::EXPLICIT_PROVIDER:
       provider_type = TemplateURLFetcher::EXPLICIT_PROVIDER;
       break;
 
     default:
       NOTREACHED();
       return;
   }
 
   const NavigationController& controller = web_contents()->GetController();
-  const content::NavigationEntry* entry = controller.GetLastCommittedEntry();
+  const NavigationEntry* entry = controller.GetLastCommittedEntry();
   DCHECK(entry);
 
-  const content::NavigationEntry* base_entry = entry;
+  const NavigationEntry* base_entry = entry;
   if (IsFormSubmit(base_entry)) {
     // If the current page is a form submit, find the last page that was not
     // a form submit and use its url to generate the keyword from.
     int index = controller.last_committed_entry_index() - 1;
     while (index >= 0 && IsFormSubmit(controller.GetEntryAtIndex(index)))
       index--;
     if (index >= 0)
       base_entry = controller.GetEntryAtIndex(index);
     else
       base_entry = NULL;
@@ skipping 33 matching lines @@
     return;
 
   const NavigationController& controller = web_contents()->GetController();
   int last_index = controller.last_committed_entry_index();
   // When there was no previous page, the last index will be 0. This is
   // normally due to a form submit that opened in a new tab.
   // TODO(brettw) bug 916126: we should support keywords when form submits
   //              happen in new tabs.
   if (last_index <= 0)
     return;
-  const content::NavigationEntry* previous_entry =
+  const NavigationEntry* previous_entry =
       controller.GetEntryAtIndex(last_index - 1);
   if (IsFormSubmit(previous_entry)) {
     // Only generate a keyword if the previous page wasn't itself a form
     // submit.
     return;
   }
 
   GURL keyword_url = previous_entry->GetUserTypedURL().is_valid() ?
           previous_entry->GetUserTypedURL() : previous_entry->GetURL();
   string16 keyword =
@@ skipping 39 matching lines @@
     // or the favicon url wasn't obtained before the load started. This assumes
     // the later.
     // TODO(sky): Need a way to set the favicon that doesn't involve generating
     // its url.
     new_url->SetFaviconURL(
         TemplateURL::GenerateFaviconURL(params.referrer.url));
   }
   new_url->set_safe_for_autoreplace(true);
   url_service->Add(new_url);
 }