Remove ash-disable-launcher-per-display flag

ash/wm/ash_activation_controller.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/wm/ash_activation_controller.h"
 
 #include "ash/launcher/launcher.h"
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
@@ skipping 78 matching lines @@
   // If workspace controller is not available, then it means that the root
   // window is being destroyed. We can't activate any window then.
   if (!GetRootWindowController(
       Shell::GetActiveRootWindow())->workspace_controller()) {
     return NULL;
   }
   // Fallback to a launcher only when Spoken feedback is enabled.
   if (!Shell::GetInstance()->delegate()->IsSpokenFeedbackEnabled())
     return NULL;
   ShelfWidget* shelf = GetRootWindowController(
-      Shell::IsLauncherPerDisplayEnabled() ?
-          Shell::GetActiveRootWindow() :
-          Shell::GetPrimaryRootWindow())->shelf();
+      Shell::GetActiveRootWindow())->shelf();
   // Launcher's window may be already destroyed in shutting down process.
   if (!shelf)
     return NULL;
   // Notify launcher to allow activation via CanActivate().
   shelf->WillActivateAsFallback();
   return shelf->GetNativeWindow();
 }
 
 }  // namespace internal
 }  // namespace ash