Revert 170406 - Align panel icons on the right / end.

ash/shell/window_watcher.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/shell/window_watcher.h"
 
 #include "ash/launcher/launcher.h"
 #include "ash/launcher/launcher_model.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
@@ skipping 61 matching lines @@
 
 // aura::WindowObserver overrides:
 void WindowWatcher::OnWindowAdded(aura::Window* new_window) {
   if (new_window->type() != aura::client::WINDOW_TYPE_NORMAL &&
       new_window->type() != aura::client::WINDOW_TYPE_PANEL)
     return;
 
   static int image_count = 0;
   ash::LauncherModel* model = Launcher::ForPrimaryDisplay()->model();
   ash::LauncherItem item;
-  item.type = new_window->type() == aura::client::WINDOW_TYPE_PANEL ?
-                                    ash::TYPE_APP_PANEL : ash::TYPE_TABBED;
+  item.type = ash::TYPE_TABBED;
   id_to_window_[model->next_id()] = new_window;
 
   SkBitmap icon_bitmap;
   icon_bitmap.setConfig(SkBitmap::kARGB_8888_Config, 16, 16);
   icon_bitmap.allocPixels();
   icon_bitmap.eraseARGB(255,
                         image_count == 0 ? 255 : 0,
                         image_count == 1 ? 255 : 0,
                         image_count == 2 ? 255 : 0);
   image_count = (image_count + 1) % 3;
@@ skipping 12 matching lines @@
       DCHECK_NE(-1, index);
       model->RemoveItemAt(index);
       id_to_window_.erase(i);
       break;
     }
   }
 }
 
 }  // namespace shell
 }  // namespace ash