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

chrome/browser/ui/views/ash/launcher/launcher_updater.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 "chrome/browser/ui/views/ash/launcher/launcher_updater.h"
 
 #include "ash/launcher/launcher.h"
 #include "ash/launcher/launcher_model.h"
 #include "ash/shell.h"
 #include "ash/wm/window_util.h"
@@ skipping 20 matching lines @@
 LauncherUpdater::LauncherUpdater(aura::Window* window,
                                  TabStripModel* tab_model,
                                  ChromeLauncherDelegate* delegate,
                                  Type type,
                                  const std::string& app_id)
     : window_(window),
       tab_model_(tab_model),
       launcher_delegate_(delegate),
       type_(type),
       app_id_(app_id),
-      is_incognito_(tab_model->profile()->GetOriginalProfile() !=
-                    tab_model->profile()),
       item_id_(-1) {
 }
 
 LauncherUpdater::~LauncherUpdater() {
   tab_model_->RemoveObserver(this);
   if (item_id_ != -1)
     launcher_delegate_->LauncherItemClosed(item_id_);
   for (AppTabMap::iterator i = app_map_.begin(); i != app_map_.end(); ++i)
     launcher_delegate_->LauncherItemClosed(i->second.id);
 }
@@ skipping 214 matching lines @@
       if (!launcher_delegate_->IsPinned(launcher_id)) {
         // Swap the item for a tabbed item.
         item_id_ = launcher_id;
         launcher_delegate_->ConvertAppToTabbed(item_id_);
       } else {
         // If the app is pinned we have to leave it and create a new tabbed
         // item.
         launcher_delegate_->LauncherItemClosed(launcher_id);
         CreateTabbedItem();
       }
-      ash::LauncherItem item;
-      item.type = ash::TYPE_TABBED;
-      item.is_incognito = is_incognito_;
+      ash::LauncherItem item(ash::TYPE_TABBED);
       item.num_tabs = tab_model_->count();
       launcher_model()->Set(launcher_model()->ItemIndexByID(item_id_), item);
     } else {
       // We have a tabbed item, so we can remove the the app item.
       launcher_delegate_->LauncherItemClosed(launcher_id);
     }
   } else {
     // Going from not showing to showing.
     if (item_id_ != -1 &&
         static_cast<int>(app_map_.size()) + 1 == tab_model_->count()) {
@@ skipping 32 matching lines @@
 void LauncherUpdater::RegisterAppItem(ash::LauncherID id,
                                       TabContentsWrapper* tab) {
   AppTabDetails details;
   details.id = id;
   details.app_id = launcher_delegate_->GetAppID(tab);
   app_map_[tab] = details;
 }
 
 void LauncherUpdater::CreateTabbedItem() {
   DCHECK_EQ(-1, item_id_);
-  item_id_ = launcher_delegate_->CreateTabbedLauncherItem(
-      this,
-      is_incognito_ ? ChromeLauncherDelegate::STATE_INCOGNITO :
-                      ChromeLauncherDelegate::STATE_NOT_INCOGNITO);
+  item_id_ = launcher_delegate_->CreateTabbedLauncherItem(this);
 }
 
 bool LauncherUpdater::ContainsID(ash::LauncherID id, TabContentsWrapper** tab) {
   if (item_id_ == id)
     return true;
   for (AppTabMap::const_iterator i = app_map_.begin(); i != app_map_.end();
        ++i) {
     if (i->second.id == id) {
       *tab = i->first;
       return true;
     }
   }
   return false;
 }
 
 ash::LauncherModel* LauncherUpdater::launcher_model() {
   return launcher_delegate_->model();
 }