| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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/views/create_application_shortcut_view.h" | 5 #include "chrome/browser/views/create_application_shortcut_view.h" |
| 6 | 6 |
| 7 #include "app/l10n_util.h" | 7 #include "app/l10n_util.h" |
| 8 #include "app/resource_bundle.h" | 8 #include "app/resource_bundle.h" |
| 9 #include "base/callback.h" | 9 #include "base/callback.h" |
| 10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
| 11 #include "chrome/browser/pref_service.h" | 11 #include "chrome/browser/prefs/pref_service.h" |
| 12 #include "chrome/browser/profile.h" | 12 #include "chrome/browser/profile.h" |
| 13 #include "chrome/browser/tab_contents/tab_contents.h" | 13 #include "chrome/browser/tab_contents/tab_contents.h" |
| 14 #include "chrome/browser/tab_contents/tab_contents_delegate.h" | 14 #include "chrome/browser/tab_contents/tab_contents_delegate.h" |
| 15 #include "chrome/common/chrome_constants.h" | 15 #include "chrome/common/chrome_constants.h" |
| 16 #include "chrome/common/pref_names.h" | 16 #include "chrome/common/pref_names.h" |
| 17 #include "gfx/canvas_skia.h" | 17 #include "gfx/canvas_skia.h" |
| 18 #include "gfx/codec/png_codec.h" | 18 #include "gfx/codec/png_codec.h" |
| 19 #include "grit/generated_resources.h" | 19 #include "grit/generated_resources.h" |
| 20 #include "grit/locale_settings.h" | 20 #include "grit/locale_settings.h" |
| 21 #include "net/base/load_flags.h" | 21 #include "net/base/load_flags.h" |
| (...skipping 426 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 448 const SkBitmap& image) { | 448 const SkBitmap& image) { |
| 449 pending_download_ = NULL; | 449 pending_download_ = NULL; |
| 450 | 450 |
| 451 if (!errored && !image.isNull()) { | 451 if (!errored && !image.isNull()) { |
| 452 shortcut_info_.favicon = image; | 452 shortcut_info_.favicon = image; |
| 453 static_cast<AppInfoView*>(app_info_)->UpdateIcon(shortcut_info_.favicon); | 453 static_cast<AppInfoView*>(app_info_)->UpdateIcon(shortcut_info_.favicon); |
| 454 } else { | 454 } else { |
| 455 FetchIcon(); | 455 FetchIcon(); |
| 456 } | 456 } |
| 457 } | 457 } |
| OLD | NEW |