Pass shelf instances, not root windows, for ash context menus.

chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc

 // Copyright 2013 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.h"
 
 #include <stddef.h>
 
 #include <vector>
 
@@ skipping 1003 matching lines @@
 }
 
 ash::ShelfModel* ChromeLauncherController::model() {
   return model_;
 }
 
 Profile* ChromeLauncherController::profile() {
   return profile_;
 }
 
-ash::ShelfAutoHideBehavior ChromeLauncherController::GetShelfAutoHideBehavior(
-    aura::Window* root_window) const {
-  return GetShelfAutoHideBehaviorFromPrefs(profile_, root_window);
-}
-
-bool ChromeLauncherController::CanUserModifyShelfAutoHideBehavior(
-    aura::Window* root_window) const {
-#if defined(OS_WIN)
-  // Disable shelf auto-hide behavior on screen sides in Metro mode.
-  if (ash::Shell::GetInstance()->GetShelfAlignment(root_window) !=
-      ash::SHELF_ALIGNMENT_BOTTOM) {
-    return false;
-  }
-#endif
-  return profile_->GetPrefs()->
-      FindPreference(prefs::kShelfAutoHideBehaviorLocal)->IsUserModifiable();
-}
-
-void ChromeLauncherController::ToggleShelfAutoHideBehavior(
-    aura::Window* root_window) {
-  ash::ShelfAutoHideBehavior behavior = GetShelfAutoHideBehavior(root_window) ==
-      ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS ?
-          ash::SHELF_AUTO_HIDE_BEHAVIOR_NEVER :
-          ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS;
-  SetShelfAutoHideBehaviorPrefs(behavior, root_window);
-  return;
-}
-
 void ChromeLauncherController::UpdateAppState(content::WebContents* contents,
                                               AppState app_state) {
   std::string app_id = app_tab_helper_->GetAppID(contents);
 
   // Check if the gMail app is loaded and it matches the given content.
   // This special treatment is needed to address crbug.com/234268.
   if (app_id.empty() && ContentCanBeHandledByGmailApp(contents))
     app_id = kGmailAppId;
 
   // Check the old |app_id| for a tab. If the contents has changed we need to
@@ skipping 767 matching lines @@
 
   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 ChromeLauncherController::SetShelfAutoHideBehaviorFromPrefs() {
   aura::Window::Windows root_windows = ash::Shell::GetAllRootWindows();
-
-  for (aura::Window::Windows::const_iterator iter = root_windows.begin();
-       iter != root_windows.end(); ++iter) {
+  for (auto i = root_windows.begin(); i != root_windows.end(); ++i) {
     ash::Shell::GetInstance()->SetShelfAutoHideBehavior(
-        GetShelfAutoHideBehavior(*iter), *iter);
+        GetShelfAutoHideBehaviorFromPrefs(profile_, *i), *i);
   }
 }
 
 void ChromeLauncherController::SetShelfAlignmentFromPrefs() {
   if (!ash::ShelfWidget::ShelfAlignmentAllowed())
     return;
 
   aura::Window::Windows root_windows = ash::Shell::GetAllRootWindows();
-
-  for (aura::Window::Windows::const_iterator iter = root_windows.begin();
-       iter != root_windows.end(); ++iter) {
+  for (auto i = root_windows.begin(); i != root_windows.end(); ++i) {
     ash::Shell::GetInstance()->SetShelfAlignment(
-        GetShelfAlignmentFromPrefs(profile_, *iter), *iter);
+        GetShelfAlignmentFromPrefs(profile_, *i), *i);
   }
 }
 
 void ChromeLauncherController::SetShelfBehaviorsFromPrefs() {
   SetShelfAutoHideBehaviorFromPrefs();
   SetShelfAlignmentFromPrefs();
 }
 
 #if defined(OS_CHROMEOS)
 void ChromeLauncherController::SetVirtualKeyboardBehaviorFromPrefs() {
@@ skipping 382 matching lines @@
 
 AppIconLoader* ChromeLauncherController::GetAppIconLoaderForApp(
     const std::string& app_id) {
   for (const auto& app_icon_loader : app_icon_loaders_) {
     if (app_icon_loader->CanLoadImageForApp(app_id))
       return app_icon_loader.get();
   }
 
   return nullptr;
 }