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

chrome/browser/external_tab_container_win.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/external_tab_container_win.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 49 matching lines @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebReferrerPolicy.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityPolicy.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/menu_model.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/view_prop.h"
 #include "ui/views/layout/grid_layout.h"
 
 using content::BrowserThread;
+using content::NavigationEntry;
 using content::OpenURLParams;
 using content::SSLStatus;
 using content::WebContents;
 using ui::ViewProp;
 using WebKit::WebCString;
 using WebKit::WebString;
 using WebKit::WebReferrerPolicy;
 using WebKit::WebSecurityPolicy;
 
 static const char kWindowObjectKey[] = "ChromeWindowObject";
@@ skipping 869 matching lines @@
   msg.wParam = wparam;
   msg.lParam = lparam;
   automation_->Send(new AutomationMsg_HandleAccelerator(tab_handle_, msg));
   return true;
 }
 
 bool ExternalTabContainer::InitNavigationInfo(NavigationInfo* nav_info,
                                               content::NavigationType nav_type,
                                               int relative_offset) {
   DCHECK(nav_info);
-  content::NavigationEntry* entry =
+  NavigationEntry* entry =
       tab_contents_->tab_contents()->GetController().GetActiveEntry();
   // If this is very early in the game then we may not have an entry.
   if (!entry)
     return false;
 
   nav_info->navigation_type = nav_type;
   nav_info->relative_offset = relative_offset;
   nav_info->navigation_index =
       tab_contents_->tab_contents()->GetController().GetCurrentEntryIndex();
   nav_info->url = entry->GetURL();
@@ skipping 228 matching lines @@
   if (params.disposition == CURRENT_TAB) {
     DCHECK(route_all_top_level_navigations_);
     forward_params.disposition = NEW_FOREGROUND_TAB;
   }
   WebContents* new_contents =
       ExternalTabContainer::OpenURLFromTab(source, forward_params);
   // support only one navigation for a dummy tab before it is killed.
   ::DestroyWindow(GetNativeView());
   return new_contents;
 }