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

chrome/browser/ui/views/ash/launcher/chrome_launcher_delegate.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/chrome_launcher_delegate.h"
 
 #include "ash/launcher/launcher_model.h"
 #include "ash/launcher/launcher_types.h"
 #include "ash/wm/window_util.h"
 #include "base/command_line.h"
@@ skipping 104 matching lines @@
 
 // static
 void ChromeLauncherDelegate::RegisterUserPrefs(PrefService* user_prefs) {
   // TODO: If we want to support multiple profiles this will likely need to be
   // pushed to local state and we'll need to track profile per item.
   user_prefs->RegisterListPref(prefs::kPinnedLauncherApps,
                                PrefService::SYNCABLE_PREF);
 }
 
 ash::LauncherID ChromeLauncherDelegate::CreateTabbedLauncherItem(
-    LauncherUpdater* updater,
-    IncognitoState is_incognito) {
+    LauncherUpdater* updater) {
   // Tabbed items always get a new item. Put the tabbed item before the app
   // tabs. If there are no app tabs put it at the end.
   int index = static_cast<int>(model_->items().size());
   for (IDToItemMap::const_iterator i = id_to_item_map_.begin();
        i != id_to_item_map_.end(); ++i) {
     if (i->second.updater == updater) {
       DCHECK_EQ(TYPE_APP, i->second.item_type);
       index = std::min(index, model_->ItemIndexByID(i->first));
     }
   }
   ash::LauncherID id = model_->next_id();
-  ash::LauncherItem item;
-  item.type = ash::TYPE_TABBED;
-  item.is_incognito = (is_incognito == STATE_INCOGNITO);
+  ash::LauncherItem item(ash::TYPE_TABBED);
   item.status = ash::STATUS_RUNNING;
   model_->Add(index, item);
   DCHECK(id_to_item_map_.find(id) == id_to_item_map_.end());
   id_to_item_map_[id].item_type = TYPE_TABBED_BROWSER;
   id_to_item_map_[id].updater = updater;
   return id;
 }
 
 ash::LauncherID ChromeLauncherDelegate::CreateAppLauncherItem(
     LauncherUpdater* updater,
@@ skipping 28 matching lines @@
         } else {
           min_tab_index =
               std::min(min_app_index, model_->ItemIndexByID(i->first));
         }
       }
     }
   }
   int insert_index = min_app_index != item_count ?
       min_app_index : std::min(item_count, min_tab_index + 1);
   ash::LauncherID id = model_->next_id();
-  ash::LauncherItem item;
-  item.type = ash::TYPE_APP;
-  item.is_incognito = false;
+  ash::LauncherItem item(ash::TYPE_APP);
   item.image = Extension::GetDefaultIcon(true);
   item.status = status;
   model_->Add(insert_index, item);
   DCHECK(id_to_item_map_.find(id) == id_to_item_map_.end());
   id_to_item_map_[id].item_type = TYPE_APP;
   id_to_item_map_[id].app_type = app_type;
   id_to_item_map_[id].app_id = app_id;
   id_to_item_map_[id].updater = updater;
   id_to_item_map_[id].pinned = updater == NULL;
 
@@ skipping 21 matching lines @@
 void ChromeLauncherDelegate::ConvertTabbedToApp(ash::LauncherID id,
                                                 const std::string& app_id,
                                                 AppType app_type) {
   DCHECK(id_to_item_map_.find(id) != id_to_item_map_.end());
   DCHECK_EQ(TYPE_TABBED_BROWSER, id_to_item_map_[id].item_type);
   DCHECK(!id_to_item_map_[id].pinned);
   id_to_item_map_[id].item_type = TYPE_APP;
   id_to_item_map_[id].app_type = app_type;
   id_to_item_map_[id].app_id = app_id;
 
-  ash::LauncherItem item;
-  item.type = ash::TYPE_APP;
-  item.is_incognito = false;
+  ash::LauncherItem item(ash::TYPE_APP);
   item.id = id;
   model_->Set(model_->ItemIndexByID(id), item);
 
   app_icon_loader_->FetchImage(app_id);
 }
 
 void ChromeLauncherDelegate::LauncherItemClosed(ash::LauncherID id) {
   DCHECK(id_to_item_map_.find(id) != id_to_item_map_.end());
   if (id_to_item_map_[id].pinned) {
     // The item is pinned, leave it in the launcher.
@@ skipping 264 matching lines @@
 Profile* ChromeLauncherDelegate::GetProfileForNewWindows() {
   Profile* profile = ProfileManager::GetDefaultProfile();
   if (browser_defaults::kAlwaysOpenIncognitoWindow &&
       IncognitoModePrefs::ShouldLaunchIncognito(
           *CommandLine::ForCurrentProcess(),
           profile->GetPrefs())) {
     profile = profile->GetOffTheRecordProfile();
   }
   return profile;
 }