Remove ash-disable-launcher-per-display flag

ash/root_window_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/root_window_controller.h"
 
 #include <vector>
 
 #include "ash/ash_constants.h"
 #include "ash/ash_switches.h"
@@ skipping 165 matching lines @@
   aura::client::SetStackingClient(root_window, stacking_controller_.get());
 }
 
 RootWindowController::~RootWindowController() {
   Shutdown();
   root_window_.reset();
 }
 
 // static
 RootWindowController* RootWindowController::ForLauncher(aura::Window* window) {
-  if (Shell::IsLauncherPerDisplayEnabled())
-    return GetRootWindowController(window->GetRootWindow());
-  else
-    return Shell::GetPrimaryRootWindowController();
+  return GetRootWindowController(window->GetRootWindow());
 }
 
 // static
 RootWindowController* RootWindowController::ForWindow(
     const aura::Window* window) {
   return GetRootWindowController(window->GetRootWindow());
 }
 
 // static
 RootWindowController* RootWindowController::ForActiveRootWindow() {
@@ skipping 68 matching lines @@
 void RootWindowController::InitForPrimaryDisplay() {
   DCHECK(!shelf_.get());
   aura::Window* shelf_container =
       GetContainer(ash::internal::kShellWindowId_ShelfContainer);
   // TODO(harrym): Remove when status area is view.
   aura::Window* status_container =
       GetContainer(ash::internal::kShellWindowId_StatusContainer);
   shelf_.reset(new ash::ShelfWidget(
       shelf_container, status_container, workspace_controller()));
 
-  if (Shell::IsLauncherPerDisplayEnabled() ||
-      root_window_ == Shell::GetPrimaryRootWindow()) {
-    // Create Panel layout manager
-    aura::Window* panel_container = GetContainer(
-        internal::kShellWindowId_PanelContainer);
-    panel_layout_manager_ =
-        new internal::PanelLayoutManager(panel_container);
-    panel_container_handler_.reset(
-        new ToplevelWindowEventHandler(panel_container));
-    panel_container->SetLayoutManager(panel_layout_manager_);
-  }
+  // Create Panel layout manager
+  aura::Window* panel_container = GetContainer(
+      internal::kShellWindowId_PanelContainer);
+  panel_layout_manager_ =
+      new internal::PanelLayoutManager(panel_container);
+  panel_container_handler_.reset(
+      new ToplevelWindowEventHandler(panel_container));
+  panel_container->SetLayoutManager(panel_layout_manager_);
+
   if (Shell::GetInstance()->session_state_delegate()->HasActiveUser())
     shelf_->CreateLauncher();
 
   InitKeyboard();
 }
 
 void RootWindowController::CreateContainers() {
   CreateContainersInRootWindow(root_window_.get());
 
   // Create touch observer HUD if needed. HUD should be created after the
@@ skipping 110 matching lines @@
 
 SystemTray* RootWindowController::GetSystemTray() {
   // We assume in throughout the code that this will not return NULL. If code
   // triggers this for valid reasons, it should test status_area_widget first.
   CHECK(shelf_.get() && shelf_->status_area_widget());
   return shelf_->status_area_widget()->system_tray();
 }
 
 void RootWindowController::ShowContextMenu(
     const gfx::Point& location_in_screen) {
-  aura::RootWindow* target = Shell::IsLauncherPerDisplayEnabled() ?
-      root_window() : Shell::GetPrimaryRootWindow();
   DCHECK(Shell::GetInstance()->delegate());
   scoped_ptr<ui::MenuModel> menu_model(
-      Shell::GetInstance()->delegate()->CreateContextMenu(target));
+      Shell::GetInstance()->delegate()->CreateContextMenu(root_window()));
   if (!menu_model)
     return;
 
   internal::DesktopBackgroundWidgetController* background =
       root_window_->GetProperty(kDesktopController);
   // Background controller may not be set yet if user clicked on status are
   // before initial animation completion. See crbug.com/222218
   if (!background)
     return;
 
@@ skipping 196 matching lines @@
       "OverlayContainer",
       lock_screen_related_containers);
   SetUsesScreenCoordinates(overlay_container);
 
   CreateContainer(kShellWindowId_PowerButtonAnimationContainer,
                   "PowerButtonAnimationContainer", root_window) ;
 }
 
 }  // namespace internal
 }  // namespace ash