Revert 126256 - Show a different icon in the launcher for incognito windows

ash/launcher/tabbed_launcher_button.cc

 // Copyright (c) 2012 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.
 
 #include "ash/launcher/tabbed_launcher_button.h"
 
 #include <algorithm>
 
 #include "ash/launcher/launcher_button_host.h"
-#include "ash/launcher/launcher_types.h"
 #include "grit/ui_resources.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/animation/multi_animation.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/insets.h"
 
 namespace ash {
 namespace internal {
 
-TabbedLauncherButton::IconView::IconView(
-    TabbedLauncherButton* host,
-    TabbedLauncherButton::IncognitoState is_incognito)
+TabbedLauncherButton::IconView::IconView(TabbedLauncherButton* host)
     : host_(host),
       show_image_(true) {
   if (!browser_image_) {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
 
     browser_image_ = new SkBitmap(
         *rb.GetImageNamed(IDR_AURA_LAUNCHER_BROWSER).ToSkBitmap());
-    incognito_browser_image_ = new SkBitmap(
-        *rb.GetImageNamed(IDR_AURA_LAUNCHER_INCOGNITO_BROWSER).ToSkBitmap());
     browser_panel_image_ = new SkBitmap(
         *rb.GetImageNamed(IDR_AURA_LAUNCHER_BROWSER_PANEL).ToSkBitmap());
-    incognito_browser_panel_image_ = new SkBitmap(
-        *rb.GetImageNamed(
-            IDR_AURA_LAUNCHER_INCOGNITO_BROWSER_PANEL).ToSkBitmap());
   }
   set_icon_size(0);
-  if (is_incognito == STATE_NOT_INCOGNITO)
-    LauncherButton::IconView::SetImage(*browser_image_);
-  else
-    LauncherButton::IconView::SetImage(*incognito_browser_image_);
+  LauncherButton::IconView::SetImage(*browser_image_);
 }
 
 TabbedLauncherButton::IconView::~IconView() {
 }
 
 void TabbedLauncherButton::IconView::AnimationEnded(
     const ui::Animation* animation) {
   AnimationProgressed(animation);
   // Hide the image when the animation is done. We'll show it again the next
   // time SetImages is invoked.
@@ skipping 41 matching lines @@
   int x = (width() - image_.width()) / 2;
   int y = (height() - image_.height()) / 2;
   canvas->DrawBitmapInt(image_, x, y);
 
   if (save_layer)
     canvas->Restore();
 }
 
 // static
 SkBitmap* TabbedLauncherButton::IconView::browser_image_ = NULL;
-SkBitmap* TabbedLauncherButton::IconView::incognito_browser_image_ = NULL;
 SkBitmap* TabbedLauncherButton::IconView::browser_panel_image_ = NULL;
-SkBitmap* TabbedLauncherButton::IconView::incognito_browser_panel_image_ = NULL;
 
 TabbedLauncherButton* TabbedLauncherButton::Create(
     views::ButtonListener* listener,
-    LauncherButtonHost* host,
-    IncognitoState is_incognito) {
-  TabbedLauncherButton* button =
-      new TabbedLauncherButton(listener, host, is_incognito);
+    LauncherButtonHost* host) {
+  TabbedLauncherButton* button = new TabbedLauncherButton(listener, host);
   button->Init();
   return button;
 }
 
 TabbedLauncherButton::TabbedLauncherButton(views::ButtonListener* listener,
-                                           LauncherButtonHost* host,
-                                           IncognitoState is_incognito)
-    : LauncherButton(listener, host),
-      is_incognito_(is_incognito) {
+                                           LauncherButtonHost* host)
+    : LauncherButton(listener, host) {
   set_accessibility_focusable(true);
 }
 
 TabbedLauncherButton::~TabbedLauncherButton() {
 }
 
 void TabbedLauncherButton::PrepareForImageChange() {
   tabbed_icon_view()->PrepareForImageChange();
 }
 
 void TabbedLauncherButton::SetTabImage(const SkBitmap& image) {
   tabbed_icon_view()->SetTabImage(image);
 }
 
 void TabbedLauncherButton::GetAccessibleState(ui::AccessibleViewState* state) {
   state->role = ui::AccessibilityTypes::ROLE_PUSHBUTTON;
   state->name = host()->GetAccessibleName(this);
 }
 
 LauncherButton::IconView* TabbedLauncherButton::CreateIconView() {
-  return new IconView(this, is_incognito_);
+  return new IconView(this);
 }
 
 }  // namespace internal
 }  // namespace ash