Revert 126764 - Added notion of currently active app / browser

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 189 matching lines @@
   id_to_item_map_[id].pinned = updater == NULL;
 
   if (app_type != APP_TYPE_PANEL)
     app_icon_loader_->FetchImage(app_id);
   return id;
 }
 
 void ChromeLauncherDelegate::SetItemStatus(ash::LauncherID id,
                                            ash::LauncherItemStatus status) {
   int index = model_->ItemIndexByID(id);
-  DCHECK_GE(index, 0);
   ash::LauncherItem item = model_->items()[index];
   item.status = status;
   model_->Set(index, item);
 }
 
 void ChromeLauncherDelegate::ConvertAppToTabbed(ash::LauncherID id) {
   DCHECK(id_to_item_map_.find(id) != id_to_item_map_.end());
   DCHECK_EQ(TYPE_APP, id_to_item_map_[id].item_type);
   DCHECK(!id_to_item_map_[id].pinned);
   id_to_item_map_[id].item_type = TYPE_TABBED_BROWSER;
@@ skipping 17 matching lines @@
   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.
     id_to_item_map_[id].updater = NULL;
+    printf("ChromeLauncherDelegate::LauncherItemClosed\n");
     SetItemStatus(id, ash::STATUS_CLOSED);
   } else {
     id_to_item_map_.erase(id);
     model_->RemoveItemAt(model_->ItemIndexByID(id));
   }
 }
 
 void ChromeLauncherDelegate::AppIDChanged(ash::LauncherID id,
                                           const std::string& app_id) {
   DCHECK(id_to_item_map_.find(id) != id_to_item_map_.end());
@@ skipping 262 matching lines @@
 Profile* ChromeLauncherDelegate::GetProfileForNewWindows() {
   Profile* profile = ProfileManager::GetDefaultProfile();
   if (browser_defaults::kAlwaysOpenIncognitoWindow &&
       IncognitoModePrefs::ShouldLaunchIncognito(
           *CommandLine::ForCurrentProcess(),
           profile->GetPrefs())) {
     profile = profile->GetOffTheRecordProfile();
   }
   return profile;
 }