Remove ash-disable-launcher-per-display flag

chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.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 "chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.h"
 
 #include <vector>
 
 #include "ash/launcher/launcher_model.h"
 #include "ash/root_window_controller.h"
@@ skipping 627 matching lines @@
     ash::LauncherItem item = model_->items()[index];
     item.image = image;
     model_->Set(index, item);
     // It's possible we're waiting on more than one item, so don't break.
   }
 }
 
 void ChromeLauncherControllerPerBrowser::OnAutoHideBehaviorChanged(
     ash::ShelfAutoHideBehavior new_behavior) {
     std::string behavior_string;
-  ash::Shell::RootWindowList root_windows;
-  if (ash::Shell::IsLauncherPerDisplayEnabled())
-    root_windows = ash::Shell::GetAllRootWindows();
-  else
-    root_windows.push_back(ash::Shell::GetPrimaryRootWindow());
+  ash::Shell::RootWindowList root_windows = ash::Shell::GetAllRootWindows();
 
   for (ash::Shell::RootWindowList::const_iterator iter =
            root_windows.begin();
        iter != root_windows.end(); ++iter) {
     SetShelfAutoHideBehaviorPrefs(new_behavior, *iter);
   }
 }
 
 void ChromeLauncherControllerPerBrowser::SetLauncherItemImage(
     ash::LauncherID launcher_id,
@@ skipping 602 matching lines @@
       profile_->GetPrefs(), root_window, prefs::kShelfAutoHideBehavior, value);
 
   if (root_window == ash::Shell::GetPrimaryRootWindow()) {
     // See comment in |kShelfAlignment| about why we have two prefs here.
     profile_->GetPrefs()->SetString(prefs::kShelfAutoHideBehaviorLocal, value);
     profile_->GetPrefs()->SetString(prefs::kShelfAutoHideBehavior, value);
   }
 }
 
 void ChromeLauncherControllerPerBrowser::SetShelfAutoHideBehaviorFromPrefs() {
-  ash::Shell::RootWindowList root_windows;
-  if (ash::Shell::IsLauncherPerDisplayEnabled())
-    root_windows = ash::Shell::GetAllRootWindows();
-  else
-    root_windows.push_back(ash::Shell::GetPrimaryRootWindow());
+  ash::Shell::RootWindowList root_windows = ash::Shell::GetAllRootWindows();
 
   for (ash::Shell::RootWindowList::const_iterator iter = root_windows.begin();
        iter != root_windows.end(); ++iter) {
     ash::Shell::GetInstance()->SetShelfAutoHideBehavior(
         GetShelfAutoHideBehavior(*iter), *iter);
   }
 }
 
 void ChromeLauncherControllerPerBrowser::SetShelfAlignmentFromPrefs() {
   if (!CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kShowLauncherAlignmentMenu))
     return;
 
-  ash::Shell::RootWindowList root_windows;
-  if (ash::Shell::IsLauncherPerDisplayEnabled())
-    root_windows = ash::Shell::GetAllRootWindows();
-  else
-    root_windows.push_back(ash::Shell::GetPrimaryRootWindow());
+  ash::Shell::RootWindowList root_windows = ash::Shell::GetAllRootWindows();
 
   for (ash::Shell::RootWindowList::const_iterator iter = root_windows.begin();
        iter != root_windows.end(); ++iter) {
     // See comment in |kShelfAlignment| as to why we consider two prefs.
     const std::string alignment_value(
         GetPrefForRootWindow(profile_->GetPrefs(),
                              *iter,
                              prefs::kShelfAlignmentLocal,
                              prefs::kShelfAlignment));
     ash::ShelfAlignment alignment = ash::SHELF_ALIGNMENT_BOTTOM;
@@ skipping 81 matching lines @@
 void ChromeLauncherControllerPerBrowser::SetAppIconLoaderForTest(
     extensions::AppIconLoader* loader) {
   app_icon_loader_.reset(loader);
 }
 
 const std::string&
 ChromeLauncherControllerPerBrowser::GetAppIdFromLauncherIdForTest(
     ash::LauncherID id) {
   return id_to_item_controller_map_[id]->app_id();
 }