Revert 263262 "Newly created profiles should have the grey silho..."

trunk/src/chrome/browser/ui/cocoa/profiles/avatar_icon_controller.mm

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/ui/cocoa/profiles/avatar_icon_controller.h"
 
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_avatar_icon_util.h"
@@ skipping 81 matching lines @@
     [cell accessibilitySetOverrideValue:
         l10n_util::GetNSString(IDS_PROFILES_BUBBLE_ACCESSIBLE_DESCRIPTION)
                            forAttribute:NSAccessibilityHelpAttribute];
     [cell accessibilitySetOverrideValue:
         l10n_util::GetNSString(IDS_PROFILES_BUBBLE_ACCESSIBLE_DESCRIPTION)
                            forAttribute:NSAccessibilityDescriptionAttribute];
 
     Profile* profile = browser_->profile();
 
     if (profile->IsOffTheRecord() || profile->IsGuestSession()) {
-      const int icon_id = profile->IsGuestSession() ?
-          profiles::GetPlaceholderAvatarIconResourceID() : IDR_OTR_ICON;
+      const int icon_id = profile->IsGuestSession() ? IDR_LOGIN_GUEST :
+                                                      IDR_OTR_ICON;
       NSImage* icon = ResourceBundle::GetSharedInstance().GetNativeImageNamed(
           icon_id).ToNSImage();
       [self setImage:[self compositeImageWithShadow:icon]];
       [self setButtonEnabled:profile->IsGuestSession()];
    } else {
       [self setButtonEnabled:YES];
       [self updateAvatarButtonAndLayoutParent:NO];
 
       // Managed users cannot enter incognito mode, so we only need to check
       // it in this code path.
@@ skipping 118 matching lines @@
   // needs to be adjusted. Since the fullscreen button is positioned by
   // FramedBrowserWindow using private APIs, the easiest way to update the
   // position of the button is through this private API. Resizing the window
   // also works, but invoking |-display| does not.
   NSView* themeFrame = [[[wc window] contentView] superview];
   if ([themeFrame respondsToSelector:@selector(_tileTitlebarAndRedisplay:)])
     [themeFrame _tileTitlebarAndRedisplay:YES];
 }
 
 @end