[Mac, Win] Use the correct incognito icon in the new avatar bubble.

BUG=399696

Review URL: https://codereview.chromium.org/454613003

Cr-Commit-Position: refs/heads/master@{#289473}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289473 0039d316-1c4b-4281-b951-d872f2087c98

chrome/app/theme/theme_resources.grd

@@ -348,6 +348,7 @@
         <structure type="chrome_scaled_image" name="IDR_ICON_PROFILES_MENU_LOCK" file="common/avatar_menu_lock.png" />
         <structure type="chrome_scaled_image" name="IDR_ICON_PROFILES_MENU_AVATAR" file="common/avatar_menu_profile.png" />
         <structure type="chrome_scaled_image" name="IDR_ICON_PROFILES_MENU_SUPERVISED" file="common/avatar_menu_supervised.png" />
+        <structure type="chrome_scaled_image" name="IDR_ICON_PROFILES_MENU_INCOGNITO" file="common/incognito.png" />
         <structure type="chrome_scaled_image"
         name="IDR_ICON_PROFILES_EDIT_HOVER" file="common/edit_button_hover.png" />
         <structure type="chrome_scaled_image" name="IDR_ICON_PROFILES_EDIT_PRESSED" file="common/edit_button_pressed.png" />

chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm

@@ -1522,12 +1522,11 @@ class ActiveProfileObserverBridge : public AvatarMenuObserver,
   }
 
   if ([self shouldShowGoIncognito]) {
-    // TODO(noms): Use the correct incognito icon when it's available.
     NSButton* goIncognitoButton =
         [self hoverButtonWithRect:viewRect
                              text:l10n_util::GetNSString(
                                   IDS_PROFILES_GO_INCOGNITO_BUTTON)
-                  imageResourceId:IDR_ICON_PROFILES_MENU_AVATAR
+                  imageResourceId:IDR_ICON_PROFILES_MENU_INCOGNITO
                            action:@selector(goIncognito:)];
     viewRect.origin.y = NSMaxY([goIncognitoButton frame]);
     [container addSubview:goIncognitoButton];

chrome/browser/ui/views/profiles/profile_chooser_view.cc

@@ -1145,11 +1145,10 @@ views::View* ProfileChooserView::CreateOptionsView(bool enable_lock) {
     layout->StartRow(1, 0);
     layout->AddView(new views::Separator(views::Separator::HORIZONTAL));
 
-    // TODO(noms): Use the correct incognito icon when it's available.
     go_incognito_button_ = new BackgroundColorHoverButton(
         this,
         l10n_util::GetStringUTF16(IDS_PROFILES_GO_INCOGNITO_BUTTON),
-        *rb->GetImageSkiaNamed(IDR_ICON_PROFILES_MENU_AVATAR));
+        *rb->GetImageSkiaNamed(IDR_ICON_PROFILES_MENU_INCOGNITO));
     layout->StartRow(1, 0);
     layout->AddView(go_incognito_button_);
   }