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

Side by Side Diff: chrome/browser/ui/views/create_application_shortcut_view.cc

Issue 6693021: fav icon -> favicon. Pass 5: fav_icon -> favicon (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 9 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/touch/tabs/touch_tab.cc ('k') | chrome/browser/ui/views/tab_icon_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/views/create_application_shortcut_view.h" 5 #include "chrome/browser/ui/views/create_application_shortcut_view.h"
6 6
7 #include "base/callback.h" 7 #include "base/callback.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "base/win/windows_version.h" 9 #include "base/win/windows_version.h"
10 #include "chrome/browser/prefs/pref_service.h" 10 #include "chrome/browser/prefs/pref_service.h"
(...skipping 429 matching lines...) Expand 10 before | Expand all | Expand 10 after
440 void CreateUrlApplicationShortcutView::FetchIcon() { 440 void CreateUrlApplicationShortcutView::FetchIcon() {
441 // There should only be fetch job at a time. 441 // There should only be fetch job at a time.
442 DCHECK(pending_download_ == NULL); 442 DCHECK(pending_download_ == NULL);
443 443
444 if (unprocessed_icons_.empty()) // No icons to fetch. 444 if (unprocessed_icons_.empty()) // No icons to fetch.
445 return; 445 return;
446 446
447 pending_download_ = new IconDownloadCallbackFunctor(this); 447 pending_download_ = new IconDownloadCallbackFunctor(this);
448 DCHECK(pending_download_); 448 DCHECK(pending_download_);
449 449
450 tab_contents_->fav_icon_helper().DownloadImage( 450 tab_contents_->favicon_helper().DownloadImage(
451 unprocessed_icons_.back().url, 451 unprocessed_icons_.back().url,
452 std::max(unprocessed_icons_.back().width, 452 std::max(unprocessed_icons_.back().width,
453 unprocessed_icons_.back().height), 453 unprocessed_icons_.back().height),
454 NewCallback(pending_download_, &IconDownloadCallbackFunctor::Run)); 454 NewCallback(pending_download_, &IconDownloadCallbackFunctor::Run));
455 455
456 unprocessed_icons_.pop_back(); 456 unprocessed_icons_.pop_back();
457 } 457 }
458 458
459 void CreateUrlApplicationShortcutView::OnIconDownloaded(bool errored, 459 void CreateUrlApplicationShortcutView::OnIconDownloaded(bool errored,
460 const SkBitmap& image) { 460 const SkBitmap& image) {
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
513 void CreateChromeApplicationShortcutView::OnImageLoaded( 513 void CreateChromeApplicationShortcutView::OnImageLoaded(
514 SkBitmap* image, const ExtensionResource& resource, int index) { 514 SkBitmap* image, const ExtensionResource& resource, int index) {
515 if (image->isNull()) { 515 if (image->isNull()) {
516 NOTREACHED() << "Corrupt image in profile?"; 516 NOTREACHED() << "Corrupt image in profile?";
517 return; 517 return;
518 } 518 }
519 shortcut_info_.favicon = *image; 519 shortcut_info_.favicon = *image;
520 static_cast<AppInfoView*>(app_info_)->UpdateIcon(shortcut_info_.favicon); 520 static_cast<AppInfoView*>(app_info_)->UpdateIcon(shortcut_info_.favicon);
521 } 521 }
522 522
OLDNEW
« no previous file with comments | « chrome/browser/ui/touch/tabs/touch_tab.cc ('k') | chrome/browser/ui/views/tab_icon_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698