| OLD | NEW | 
|    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 138 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  149   SetupLayout(); |  149   SetupLayout(); | 
|  150 } |  150 } | 
|  151  |  151  | 
|  152 void AppInfoView::UpdateIcon(const SkBitmap& new_icon) { |  152 void AppInfoView::UpdateIcon(const SkBitmap& new_icon) { | 
|  153   DCHECK(icon_ != NULL); |  153   DCHECK(icon_ != NULL); | 
|  154  |  154  | 
|  155   icon_->SetImage(new_icon); |  155   icon_->SetImage(new_icon); | 
|  156 } |  156 } | 
|  157  |  157  | 
|  158 void AppInfoView::Paint(gfx::Canvas* canvas) { |  158 void AppInfoView::Paint(gfx::Canvas* canvas) { | 
|  159   gfx::Rect bounds = GetContentsBounds(); |  159   gfx::Rect bounds = GetLocalBounds(); | 
|  160  |  160  | 
|  161   SkRect border_rect = { |  161   SkRect border_rect = { | 
|  162     SkIntToScalar(bounds.x()), |  162     SkIntToScalar(bounds.x()), | 
|  163     SkIntToScalar(bounds.y()), |  163     SkIntToScalar(bounds.y()), | 
|  164     SkIntToScalar(bounds.right()), |  164     SkIntToScalar(bounds.right()), | 
|  165     SkIntToScalar(bounds.bottom()) |  165     SkIntToScalar(bounds.bottom()) | 
|  166   }; |  166   }; | 
|  167  |  167  | 
|  168   SkPaint border_paint; |  168   SkPaint border_paint; | 
|  169   border_paint.setAntiAlias(true); |  169   border_paint.setAntiAlias(true); | 
| (...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  513 void CreateChromeApplicationShortcutView::OnImageLoaded( |  513 void CreateChromeApplicationShortcutView::OnImageLoaded( | 
|  514     SkBitmap* image, ExtensionResource resource, int index) { |  514     SkBitmap* image, 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  | 
| OLD | NEW |