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

Unified Diff: chrome/browser/profiles/profile_shortcut_manager_win.cc

Issue 212603011: Newly created profiles should have the grey silhouette as avatar. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove duplicate references to resource for grey avatar. Created 6 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/profiles/profile_shortcut_manager_win.cc
diff --git a/chrome/browser/profiles/profile_shortcut_manager_win.cc b/chrome/browser/profiles/profile_shortcut_manager_win.cc
index f19f9ee4d0274c83109416753f39f2fb6d764227..fa8e0be0455e8267d680a2dbf61ba4c6c92d4587 100644
--- a/chrome/browser/profiles/profile_shortcut_manager_win.cc
+++ b/chrome/browser/profiles/profile_shortcut_manager_win.cc
@@ -103,6 +103,7 @@ const int kProfileAvatarIconResources2x[] = {
IDR_PROFILE_AVATAR_2X_23,
IDR_PROFILE_AVATAR_2X_24,
IDR_PROFILE_AVATAR_2X_25,
+ IDR_PROFILE_AVATAR_2X_26,
};
// Badges |app_icon_bitmap| with |avatar_bitmap| at the bottom right corner and
@@ -122,7 +123,10 @@ SkBitmap BadgeIcon(const SkBitmap& app_icon_bitmap,
frame.Inset(scale_factor * 2, 0, scale_factor * 2, 0);
avatar_bitmap.extractSubset(&source_bitmap, gfx::RectToSkIRect(frame));
} else {
- NOTREACHED();
+ // Square bitmaps are valid, nothing else should occur.
+ if (avatar_bitmap.width() != avatar_bitmap.height()) {
noms (inactive) 2014/03/27 20:39:53 nit: no brackets. Also: as discussed offline, I do
Mike Lerman 2014/04/02 17:46:25 Nit - Done. Offline discussion - the problem we f
+ NOTREACHED();
+ }
}
int avatar_badge_size = kProfileAvatarBadgeSize;
if (app_icon_bitmap.width() != kShortcutIconSize) {

Powered by Google App Engine
This is Rietveld 408576698