| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/ash/launcher/launcher_favicon_loader.h" | 5 #include "chrome/browser/ui/ash/launcher/launcher_favicon_loader.h" |
| 6 | 6 |
| 7 #include "ash/common/shelf/shelf_constants.h" | 7 #include "ash/shelf/shelf_constants.h" |
| 8 #include "base/bind.h" | 8 #include "base/bind.h" |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| 11 #include "base/memory/weak_ptr.h" | 11 #include "base/memory/weak_ptr.h" |
| 12 #include "content/public/browser/render_view_host.h" | 12 #include "content/public/browser/render_view_host.h" |
| 13 #include "content/public/browser/web_contents.h" | 13 #include "content/public/browser/web_contents.h" |
| 14 #include "content/public/browser/web_contents_observer.h" | 14 #include "content/public/browser/web_contents_observer.h" |
| 15 #include "third_party/skia/include/core/SkBitmap.h" | 15 #include "third_party/skia/include/core/SkBitmap.h" |
| 16 #include "url/gurl.h" | 16 #include "url/gurl.h" |
| 17 | 17 |
| (...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 170 LauncherFaviconLoader::~LauncherFaviconLoader() { | 170 LauncherFaviconLoader::~LauncherFaviconLoader() { |
| 171 } | 171 } |
| 172 | 172 |
| 173 SkBitmap LauncherFaviconLoader::GetFavicon() const { | 173 SkBitmap LauncherFaviconLoader::GetFavicon() const { |
| 174 return favicon_handler_->bitmap(); | 174 return favicon_handler_->bitmap(); |
| 175 } | 175 } |
| 176 | 176 |
| 177 bool LauncherFaviconLoader::HasPendingDownloads() const { | 177 bool LauncherFaviconLoader::HasPendingDownloads() const { |
| 178 return favicon_handler_->HasPendingDownloads(); | 178 return favicon_handler_->HasPendingDownloads(); |
| 179 } | 179 } |
| OLD | NEW |