Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(536)

Side by Side Diff: chrome/browser/ui/ash/launcher/launcher_favicon_loader.cc

Issue 2036353002: mash: Move ash/common/wm/shelf to ash/common/shelf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase again Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/shelf/shelf_constants.h" 7 #include "ash/common/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 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 LauncherFaviconLoader::~LauncherFaviconLoader() { 171 LauncherFaviconLoader::~LauncherFaviconLoader() {
172 } 172 }
173 173
174 SkBitmap LauncherFaviconLoader::GetFavicon() const { 174 SkBitmap LauncherFaviconLoader::GetFavicon() const {
175 return favicon_handler_->bitmap(); 175 return favicon_handler_->bitmap();
176 } 176 }
177 177
178 bool LauncherFaviconLoader::HasPendingDownloads() const { 178 bool LauncherFaviconLoader::HasPendingDownloads() const {
179 return favicon_handler_->HasPendingDownloads(); 179 return favicon_handler_->HasPendingDownloads();
180 } 180 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698