Remove ash-disable-launcher-per-display flag

ash/launcher/launcher_view.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/launcher/launcher_view.h"
 
 #include <algorithm>
 
 #include "ash/ash_constants.h"
 #include "ash/ash_switches.h"
@@ skipping 1235 matching lines @@
       gfx::Size pref = button->GetPreferredSize();
       button->SetTabImage(item.image);
       if (pref != button->GetPreferredSize())
         AnimateToIdealBounds();
       else
         button->SchedulePaint();
       ReflectItemStatus(item, button);
       break;
     }
     case TYPE_BROWSER_SHORTCUT:
-      if (!Shell::IsLauncherPerDisplayEnabled())
-        break;
       // Fallthrough for the new Launcher since it needs to show the activation
       // change as well.
     case TYPE_APP_SHORTCUT:
     case TYPE_WINDOWED_APP:
     case TYPE_PLATFORM_APP:
     case TYPE_APP_PANEL: {
       LauncherButton* button = static_cast<LauncherButton*>(view);
       ReflectItemStatus(item, button);
       // The browser shortcut is currently not a "real" item and as such the
       // the image is bogous as well. We therefore keep the image as is for it.
@@ skipping 340 matching lines @@
 bool LauncherView::ShouldShowTooltipForView(const views::View* view) const {
   if (view == GetAppListButtonView() &&
       Shell::GetInstance()->GetAppListWindow())
     return false;
   const LauncherItem* item = LauncherItemForView(view);
   return (!item || delegate_->ShouldShowTooltip(*item));
 }
 
 }  // namespace internal
 }  // namespace ash