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

chrome/browser/favicon/favicon_handler.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/favicon/favicon_handler.h"
 
 #include "build/build_config.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/ref_counted_memory.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/icon_messages.h"
 #include "content/public/browser/favicon_status.h"
 #include "content/public/browser/navigation_entry.h"
 #include "skia/ext/image_operations.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_util.h"
 
+using content::NavigationEntry;
+
 namespace {
 
 // Returns history::IconType the given icon_type corresponds to.
 history::IconType ToHistoryIconType(FaviconURL::IconType icon_type) {
   switch (icon_type) {
     case FaviconURL::FAVICON:
       return history::FAVICON;
     case FaviconURL::TOUCH_ICON:
       return history::TOUCH_ICON;
     case FaviconURL::TOUCH_PRECOMPOSED_ICON:
@@ skipping 99 matching lines @@
        preferred_icon_size() == bitmap.height())) ?
       image : ResizeFaviconIfNeeded(image);
 
   if (GetFaviconService() && ShouldSaveFavicon(url)) {
     std::vector<unsigned char> image_data;
     if (gfx::PNGEncodedDataFromImage(sized_image, &image_data))
       SetHistoryFavicon(url, image_url, image_data, icon_type);
   }
 
   if (url == url_ && icon_type == history::FAVICON) {
-    content::NavigationEntry* entry = GetEntry();
+    NavigationEntry* entry = GetEntry();
     if (entry)
       UpdateFavicon(entry, &sized_image);
   }
 }
 
-void FaviconHandler::UpdateFavicon(content::NavigationEntry* entry,
+void FaviconHandler::UpdateFavicon(NavigationEntry* entry,
                                    scoped_refptr<RefCountedMemory> data) {
   scoped_ptr<gfx::Image> image(gfx::ImageFromPNGEncodedData(data->front(),
                                                             data->size()));
   UpdateFavicon(entry, image.get());
 }
 
-void FaviconHandler::UpdateFavicon(content::NavigationEntry* entry,
+void FaviconHandler::UpdateFavicon(NavigationEntry* entry,
                                    const gfx::Image* image) {
   // No matter what happens, we need to mark the favicon as being set.
   entry->GetFavicon().valid = true;
 
   if (!image)
     return;
 
   entry->GetFavicon().bitmap = *image;
   delegate_->NotifyFaviconUpdated();
 }
 
 void FaviconHandler::OnUpdateFaviconURL(
     int32 page_id,
     const std::vector<FaviconURL>& candidates) {
-  content::NavigationEntry* entry = GetEntry();
+  NavigationEntry* entry = GetEntry();
   if (!entry)
     return;
 
   bool got_favicon_url_update = false;
   for (std::vector<FaviconURL>::const_iterator i = candidates.begin();
        i != candidates.end(); ++i) {
     if (!i->icon_url.is_empty() && (i->icon_type & icon_types_)) {
       if (!got_favicon_url_update) {
         got_favicon_url_update = true;
         urls_.clear();
@@ skipping 56 matching lines @@
     } else if (GetEntry() && ++current_url_index_ < urls_.size()) {
       // Copies all candidate except first one and notifies the FaviconHandler,
       // so the next candidate can be processed.
       std::vector<FaviconURL> new_candidates(++urls_.begin(), urls_.end());
       OnUpdateFaviconURL(0, new_candidates);
     }
   }
   download_requests_.erase(i);
 }
 
-content::NavigationEntry* FaviconHandler::GetEntry() {
-  content::NavigationEntry* entry = delegate_->GetActiveEntry();
+NavigationEntry* FaviconHandler::GetEntry() {
+  NavigationEntry* entry = delegate_->GetActiveEntry();
   if (entry && entry->GetURL() == url_)
     return entry;
 
   // If the URL has changed out from under us (as will happen with redirects)
   // return NULL.
   return NULL;
 }
 
 int FaviconHandler::DownloadFavicon(const GURL& image_url, int image_size) {
   if (!image_url.is_valid()) {
@@ skipping 46 matching lines @@
     return true;
 
   // Otherwise store the favicon if the page is bookmarked.
   BookmarkModel* bookmark_model = profile_->GetBookmarkModel();
   return bookmark_model && bookmark_model->IsBookmarked(url);
 }
 
 void FaviconHandler::OnFaviconDataForInitialURL(
     FaviconService::Handle handle,
     history::FaviconData favicon) {
-  content::NavigationEntry* entry = GetEntry();
+  NavigationEntry* entry = GetEntry();
   if (!entry)
     return;
 
   got_favicon_from_history_ = true;
   history_icon_ = favicon;
 
   favicon_expired_ = (favicon.known_icon && favicon.expired);
 
   if (favicon.known_icon && favicon.icon_type == history::FAVICON &&
       !entry->GetFavicon().valid &&
@@ skipping 56 matching lines @@
       // Issue the request and associate the current page ID with it.
       UpdateFaviconMappingAndFetch(page_url, icon_url, icon_type,
           &cancelable_consumer_,
           base::Bind(&FaviconHandler::OnFaviconData, base::Unretained(this)));
     }
   }
 }
 
 void FaviconHandler::OnFaviconData(FaviconService::Handle handle,
                                   history::FaviconData favicon) {
-  content::NavigationEntry* entry = GetEntry();
+  NavigationEntry* entry = GetEntry();
   if (!entry)
     return;
 
   // No need to update the favicon url. By the time we get here
   // UpdateFaviconURL will have set the favicon url.
   if (favicon.icon_type == history::FAVICON) {
     if (favicon.is_valid()) {
       // There is a favicon, set it now. If expired we'll download the current
       // one again, but at least the user will get some icon instead of the
       // default and most likely the current one is fine anyway.
@@ skipping 45 matching lines @@
   if (width > 0 && height > 0) {
     gfx::CalculateFaviconTargetSize(&width, &height);
     return gfx::Image(new SkBitmap(
                           skia::ImageOperations::Resize(
                               bitmap, skia::ImageOperations::RESIZE_LANCZOS3,
                               width, height)));
   }
 
   return image;
 }