Insert panel icons on the left of other panel icons.

chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app_unittest.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/ash/launcher/chrome_launcher_controller_per_app.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 46 matching lines @@
       removed_(0),
       changed_(0) {
   }
 
   virtual ~TestLauncherModelObserver() {
   }
 
   // LauncherModelObserver
   virtual void LauncherItemAdded(int index) OVERRIDE {
     ++added_;
+    last_index_ = index;
   }
 
   virtual void LauncherItemRemoved(int index, ash::LauncherID id) OVERRIDE {
     ++removed_;
+    last_index_ = index;
   }
 
   virtual void LauncherItemChanged(int index,
                                    const ash::LauncherItem& old_item) OVERRIDE {
     ++changed_;
+    last_index_ = index;
   }
 
   virtual void LauncherItemMoved(int start_index, int target_index) OVERRIDE {
+    last_index_ = target_index;
   }
 
   virtual void LauncherStatusChanged() OVERRIDE {
   }
 
   void clear_counts() {
     added_ = 0;
     removed_ = 0;
     changed_ = 0;
+    last_index_ = 0;
   }
 
   int added() const { return added_; }
   int removed() const { return removed_; }
   int changed() const { return changed_; }
+  int last_index() const { return last_index_; }
 
  private:
   int added_;
   int removed_;
   int changed_;
+  int last_index_;
 
   DISALLOW_COPY_AND_ASSIGN(TestLauncherModelObserver);
 };
 
 // Test implementation of AppIconLoader.
 class TestAppIconLoaderImpl : public extensions::AppIconLoader {
  public:
   TestAppIconLoaderImpl() : fetch_count_(0) {
   }
 
@@ skipping 946 matching lines @@
   TestAppIconLoaderImpl* app_icon_loader = new TestAppIconLoaderImpl();
   SetAppIconLoader(app_icon_loader);
 
   // Test adding an app panel
   std::string app_id = extension1_->id();
   ShellWindowLauncherItemController app_panel_controller(
       LauncherItemController::TYPE_APP_PANEL, "id", app_id,
       launcher_controller_.get());
   ash::LauncherID launcher_id1 = launcher_controller_->CreateAppLauncherItem(
       &app_panel_controller, app_id, ash::STATUS_RUNNING);
+  int panel_index = model_observer_->last_index();
   EXPECT_EQ(2, model_observer_->added());
   EXPECT_EQ(0, model_observer_->changed());
   EXPECT_EQ(1, app_icon_loader->fetch_count());
   model_observer_->clear_counts();
 
   // App panels should have a separate identifier than the app id
   EXPECT_EQ(0, launcher_controller_->GetLauncherIDForAppID(app_id));
 
   // Setting the app image image should not change the panel if it set its icon
   app_panel_controller.set_image_set_by_controller(true);
   gfx::ImageSkia image;
   launcher_controller_->SetAppImage(app_id, image);
   EXPECT_EQ(0, model_observer_->changed());
+  model_observer_->clear_counts();
 
+  // Add a second app panel and verify that it get the same index as the first
+  // one had, being added to the left of the existing panel.
+  ash::LauncherID launcher_id2 = launcher_controller_->CreateAppLauncherItem(
+      &app_panel_controller, app_id, ash::STATUS_RUNNING);
+  EXPECT_EQ(panel_index, model_observer_->last_index());
+  EXPECT_EQ(1, model_observer_->added());
+  model_observer_->clear_counts();
+
+  launcher_controller_->CloseLauncherItem(launcher_id2);
   launcher_controller_->CloseLauncherItem(launcher_id1);
-  EXPECT_EQ(1, model_observer_->removed());
+  EXPECT_EQ(2, model_observer_->removed());
 }
 
 // Tests that the Gmail extension matches more then the app itself claims with
 // the manifest file.
 TEST_F(ChromeLauncherControllerPerAppTest, GmailMatching) {
   InitLauncherControllerWithBrowser();
 
   // Create a Gmail browser tab.
   chrome::NewTab(browser());
   string16 title = ASCIIToUTF16("Test");
@@ skipping 39 matching lines @@
   ash::LauncherID gmail_id = model_->next_id();
   extension_service_->AddExtension(extension3_.get());
   EXPECT_EQ(3, model_->item_count());
   int gmail_index = model_->ItemIndexByID(gmail_id);
   EXPECT_EQ(ash::TYPE_APP_SHORTCUT, model_->items()[gmail_index].type);
   EXPECT_TRUE(launcher_controller_->IsAppPinned(extension3_->id()));
 
   // The content should not be able to be handled by the app.
   EXPECT_FALSE(launcher_controller_->ContentCanBeHandledByGmailApp(content));
 }