Remove ash-disable-launcher-per-display flag

ash/accelerators/accelerator_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/accelerators/accelerator_controller.h"
 
 #include <algorithm>
 #include <cmath>
 #include <iostream>
 #include <string>
@@ skipping 682 matching lines @@
       return true;
     case SHOW_OAK:
       if (CommandLine::ForCurrentProcess()->HasSwitch(
               switches::kAshEnableOak)) {
         oak::ShowOakWindowWithContext(Shell::GetPrimaryRootWindow());
         return true;
       }
       break;
     case SHOW_SYSTEM_TRAY_BUBBLE: {
       internal::RootWindowController* controller =
-          Shell::IsLauncherPerDisplayEnabled() ?
-          internal::RootWindowController::ForActiveRootWindow() :
-          Shell::GetPrimaryRootWindowController();
+          internal::RootWindowController::ForActiveRootWindow();
       if (!controller->GetSystemTray()->HasSystemBubble())
         controller->GetSystemTray()->ShowDefaultView(BUBBLE_CREATE_NEW);
       break;
     }
     case SHOW_MESSAGE_CENTER_BUBBLE: {
       internal::RootWindowController* controller =
-          Shell::IsLauncherPerDisplayEnabled() ?
-          internal::RootWindowController::ForActiveRootWindow() :
-          Shell::GetPrimaryRootWindowController();
+          internal::RootWindowController::ForActiveRootWindow();
       internal::StatusAreaWidget* status_area_widget =
           controller->shelf()->status_area_widget();
       if (status_area_widget) {
         WebNotificationTray* notification_tray =
             status_area_widget->web_notification_tray();
         if (notification_tray->visible())
           notification_tray->ShowMessageCenterBubble();
       }
       break;
     }
@@ skipping 236 matching lines @@
     keyboard_brightness_control_delegate) {
   keyboard_brightness_control_delegate_ =
       keyboard_brightness_control_delegate.Pass();
 }
 
 bool AcceleratorController::CanHandleAccelerators() const {
   return true;
 }
 
 }  // namespace ash