Remove ash-disable-launcher-per-display flag

ash/shell.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.h"
 
 #include <algorithm>
 #include <string>
 
 #include "ash/accelerators/focus_manager_factory.h"
@@ skipping 396 matching lines @@
       if (priority_root && priority_root->Contains(container))
         containers.insert(containers.begin(), container);
       else
         containers.push_back(container);
     }
   }
   return containers;
 }
 
 // static
-bool Shell::IsLauncherPerDisplayEnabled() {
-  CommandLine* command_line = CommandLine::ForCurrentProcess();
-  return !command_line->HasSwitch(switches::kAshDisableLauncherPerDisplay);
-}
-
-// static
 bool Shell::IsForcedMaximizeMode() {
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   return command_line->HasSwitch(switches::kForcedMaximizeMode);
 }
 
 void Shell::Init() {
   delegate_->PreInit();
 #if defined(OS_CHROMEOS) && defined(USE_X11)
   output_configurator_animation_.reset(
       new internal::OutputConfiguratorAnimation());
@@ skipping 292 matching lines @@
 
 void Shell::OnAppTerminating() {
   FOR_EACH_OBSERVER(ShellObserver, observers_, OnAppTerminating());
 }
 
 void Shell::OnLockStateChanged(bool locked) {
   FOR_EACH_OBSERVER(ShellObserver, observers_, OnLockStateChanged(locked));
 }
 
 void Shell::CreateLauncher() {
-  if (IsLauncherPerDisplayEnabled()) {
-    RootWindowControllerList controllers = GetAllRootWindowControllers();
-    for (RootWindowControllerList::iterator iter = controllers.begin();
-         iter != controllers.end(); ++iter)
-      (*iter)->shelf()->CreateLauncher();
-  } else {
-    GetPrimaryRootWindowController()->shelf()->CreateLauncher();
-  }
+  RootWindowControllerList controllers = GetAllRootWindowControllers();
+  for (RootWindowControllerList::iterator iter = controllers.begin();
+       iter != controllers.end(); ++iter)
+    (*iter)->shelf()->CreateLauncher();
 }
 
 void Shell::ShowLauncher() {
-  if (IsLauncherPerDisplayEnabled()) {
-    RootWindowControllerList controllers = GetAllRootWindowControllers();
-    for (RootWindowControllerList::iterator iter = controllers.begin();
-         iter != controllers.end(); ++iter)
-      (*iter)->ShowLauncher();
-  } else {
-    GetPrimaryRootWindowController()->ShowLauncher();
-  }
+  RootWindowControllerList controllers = GetAllRootWindowControllers();
+  for (RootWindowControllerList::iterator iter = controllers.begin();
+       iter != controllers.end(); ++iter)
+    (*iter)->ShowLauncher();
 }
 
 void Shell::AddShellObserver(ShellObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void Shell::RemoveShellObserver(ShellObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
@@ skipping 92 matching lines @@
 void Shell::InitRootWindowForSecondaryDisplay(aura::RootWindow* root) {
   aura::client::SetFocusClient(root, focus_client_.get());
   internal::RootWindowController* controller =
       new internal::RootWindowController(root);
   controller->CreateContainers();
   // Pass false for the |is_first_run_after_boot| parameter so we'll show a
   // black background on this display instead of trying to mimic the boot splash
   // screen.
   controller->CreateSystemBackground(false);
   InitRootWindowController(controller);
-  if (IsLauncherPerDisplayEnabled())
-    controller->InitForPrimaryDisplay();
+  controller->InitForPrimaryDisplay();
   controller->root_window_layout()->OnWindowResized();
   desktop_background_controller_->OnRootWindowAdded(root);
   high_contrast_controller_->OnRootWindowAdded(root);
   root->ShowRootWindow();
   // Activate new root for testing.
   active_root_window_ = root;
 }
 
 void Shell::DoInitialWorkspaceAnimation() {
   return GetPrimaryRootWindowController()->workspace_controller()->
@@ skipping 84 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // Shell, aura::client::ActivationChangeObserver implementation:
 
 void Shell::OnWindowActivated(aura::Window* gained_active,
                               aura::Window* lost_active) {
   if (gained_active)
     active_root_window_ = gained_active->GetRootWindow();
 }
 
 }  // namespace ash