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

content/browser/download/save_package.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 "content/browser/download/save_package.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/file_path.h"
@@ skipping 28 matching lines @@
 #include "content/public/common/url_constants.h"
 #include "net/base/io_buffer.h"
 #include "net/base/mime_util.h"
 #include "net/base/net_util.h"
 #include "net/url_request/url_request_context.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPageSerializerClient.h"
 
 using base::Time;
 using content::BrowserThread;
 using content::DownloadItem;
+using content::NavigationEntry;
 using WebKit::WebPageSerializerClient;
 
 namespace {
 
 // A counter for uniquely identifying each save package.
 int g_save_package_id = 0;
 
 // Default name which will be used when we can not get proper name from
 // resource URL.
 const char kDefaultSaveName[] = "saved_resource";
@@ skipping 158 matching lines @@
 
   file_manager_ = NULL;
 }
 
 GURL SavePackage::GetUrlToBeSaved() {
   // Instead of using tab_contents_.GetURL here, we use url()
   // (which is the "real" url of the page)
   // from the NavigationEntry because it reflects its' origin
   // rather than the displayed one (returned by GetURL) which may be
   // different (like having "view-source:" on the front).
-  content::NavigationEntry* active_entry =
+  NavigationEntry* active_entry =
       web_contents()->GetController().GetActiveEntry();
   return active_entry->GetURL();
 }
 
 void SavePackage::Cancel(bool user_action) {
   if (!canceled()) {
     if (user_action)
       user_canceled_ = true;
     else
       disk_error_occurred_ = true;
@@ skipping 1056 matching lines @@
     StopObservation();
 }
 
 void SavePackage::FinalizeDownloadEntry() {
   DCHECK(download_);
   DCHECK(download_manager_);
 
   download_manager_->SavePageDownloadFinished(download_);
   StopObservation();
 }