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

chrome/browser/instant/instant_loader.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/instant/instant_loader.h"
 
 #include <algorithm>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 33 matching lines @@
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.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/browser/web_contents_delegate.h"
 #include "net/http/http_util.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/codec/png_codec.h"
 
+using content::NavigationEntry;
+
 namespace {
 
 // Number of ms to delay before updating the omnibox bounds. This is only used
 // when the bounds of the omnibox shrinks. If the bounds grows, we update
 // immediately.
 const int kUpdateBoundsDelayMS = 1000;
 
 // If this status code is seen instant is disabled for the specified host.
 const int kHostBlacklistStatusCode = 403;
 
@@ skipping 71 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(FrameLoadObserver);
 };
 
 void InstantLoader::FrameLoadObserver::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   switch (type) {
     case content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME: {
       int page_id = *(content::Details<int>(details).ptr());
-      content::NavigationEntry* active_entry =
+      NavigationEntry* active_entry =
           tab_contents_->GetController().GetActiveEntry();
       if (!active_entry || active_entry->GetPageID() != page_id ||
           active_entry->GetUniqueID() != unique_id_) {
         return;
       }
       loader_->SendBoundsToPage(true);
       // TODO: support real cursor position.
       int text_length = static_cast<int>(text_.size());
       RenderViewHost* host = tab_contents_->GetRenderViewHost();
       host->Send(new ChromeViewMsg_DetermineIfPageSupportsInstant(
@@ skipping 169 matching lines @@
     bool supports_instant) {
   TabContentsWrapper* tab = loader_->preview_contents();
   if (tab->profile()->IsOffTheRecord())
     return;
 
   for (size_t i = 0; i < add_page_vector_.size(); ++i) {
     tab->history_tab_helper()->UpdateHistoryForNavigation(
       add_page_vector_[i].get());
   }
 
-  content::NavigationEntry* active_entry =
+  NavigationEntry* active_entry =
       tab->tab_contents()->GetController().GetActiveEntry();
   if (!active_entry) {
     // It appears to be possible to get here with no active entry. This seems
     // to be possible with an auth dialog, but I can't narrow down the
     // circumstances. If you hit this, file a bug with the steps you did and
     // assign it to me (sky).
     NOTREACHED();
     return;
   }
   tab->history_tab_helper()->UpdateHistoryPageTitle(*active_entry);
@@ skipping 196 matching lines @@
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void InstantLoader::TabContentsDelegateImpl::OnSetSuggestions(
     int32 page_id,
     const std::vector<std::string>& suggestions,
     InstantCompleteBehavior behavior) {
   TabContentsWrapper* source = loader_->preview_contents();
-  content::NavigationEntry* entry =
+  NavigationEntry* entry =
       source->tab_contents()->GetController().GetActiveEntry();
   if (!entry || page_id != entry->GetPageID())
     return;
 
   if (suggestions.empty())
     loader_->SetCompleteSuggestedText(string16(), behavior);
   else
     loader_->SetCompleteSuggestedText(UTF8ToUTF16(suggestions[0]), behavior);
 }
 
@@ skipping 539 matching lines @@
     host->Send(new ChromeViewMsg_SearchBoxResize(
         host->routing_id(), GetOmniboxBoundsInTermsOfPreview()));
   } else {
     host->Send(new ChromeViewMsg_SearchBoxChange(
         host->routing_id(), user_text, verbatim, 0, 0));
   }
 
   frame_load_observer_.reset(new FrameLoadObserver(
       this, preview_contents()->tab_contents(), user_text, verbatim));
 }