ash: Convert ShelfDelegate to use WmShelf* instead of Shelf*

chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.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_impl.h"
 
 #include <stddef.h>
 
 #include <vector>
 
@@ skipping 90 matching lines @@
 #include "ui/resources/grit/ui_resources.h"
 #include "ui/wm/core/window_animations.h"
 
 using extensions::Extension;
 using extensions::UnloadedExtensionInfo;
 using extension_misc::kGmailAppId;
 using content::WebContents;
 
 namespace {
 
-int64_t GetDisplayIDForShelf(ash::Shelf* shelf) {
-  aura::Window* root_window =
-      shelf->shelf_widget()->GetNativeWindow()->GetRootWindow();
+int64_t GetDisplayIDForShelf(ash::WmShelf* shelf) {
   display::Display display =
-      display::Screen::GetScreen()->GetDisplayNearestWindow(root_window);
+      shelf->GetWindow()->GetRootWindow()->GetDisplayNearestWindow();
   DCHECK(display.is_valid());
   return display.id();
 }
 
 }  // namespace
 
 // A class to get events from ChromeOS when a user gets changed or added.
 class ChromeLauncherControllerUserSwitchObserver
     : public user_manager::UserManager::UserSessionStateObserver {
  public:
@@ skipping 703 matching lines @@
     const AccountId& account_id) const {
   Profile* other_profile = multi_user_util::GetProfileFromAccountId(account_id);
   if (!other_profile || other_profile == profile_)
     return false;
 
   // Note: The Auto hide state from preferences is not the same as the actual
   // visibility of the shelf. Depending on all the various states (full screen,
   // no window on desktop, multi user, ..) the shelf could be shown - or not.
   PrefService* prefs = profile_->GetPrefs();
   PrefService* other_prefs = other_profile->GetPrefs();
-  const int64_t display = GetDisplayIDForShelf(shelf);
+  const int64_t display = GetDisplayIDForShelf(shelf->wm_shelf());
   const bool currently_shown =
       ash::SHELF_AUTO_HIDE_BEHAVIOR_NEVER ==
       ash::launcher::GetShelfAutoHideBehaviorPref(prefs, display);
   const bool other_shown =
       ash::SHELF_AUTO_HIDE_BEHAVIOR_NEVER ==
       ash::launcher::GetShelfAutoHideBehaviorPref(other_prefs, display);
 
   return currently_shown != other_shown ||
          ash::launcher::GetShelfAlignmentPref(prefs, display) !=
              ash::launcher::GetShelfAlignmentPref(other_prefs, display);
 }
 
 void ChromeLauncherControllerImpl::OnUserProfileReadyToSwitch(
     Profile* profile) {
   if (user_switch_observer_.get())
     user_switch_observer_->OnUserProfileReadyToSwitch(profile);
 }
 
 ArcAppDeferredLauncherController*
 ChromeLauncherControllerImpl::GetArcDeferredLauncher() {
   return arc_deferred_launcher_.get();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // ash::ShelfDelegate:
 
-void ChromeLauncherControllerImpl::OnShelfCreated(ash::Shelf* shelf) {
+void ChromeLauncherControllerImpl::OnShelfCreated(ash::WmShelf* shelf) {
   PrefService* prefs = profile_->GetPrefs();
   const int64_t display = GetDisplayIDForShelf(shelf);
 
-  shelf->wm_shelf()->SetAutoHideBehavior(
+  shelf->SetAutoHideBehavior(
       ash::launcher::GetShelfAutoHideBehaviorPref(prefs, display));
 
   if (ash::ShelfWidget::ShelfAlignmentAllowed()) {

[msw, 2016/08/24 19:52:41]

nit: nix curlies

[James Cook, 2016/08/24 19:59:08]

Done.

-    shelf->wm_shelf()->SetAlignment(
-        ash::launcher::GetShelfAlignmentPref(prefs, display));
+    shelf->SetAlignment(ash::launcher::GetShelfAlignmentPref(prefs, display));
   }
 }
 
-void ChromeLauncherControllerImpl::OnShelfDestroyed(ash::Shelf* shelf) {}
+void ChromeLauncherControllerImpl::OnShelfDestroyed(ash::WmShelf* shelf) {}
 
-void ChromeLauncherControllerImpl::OnShelfAlignmentChanged(ash::Shelf* shelf) {
-  ash::launcher::SetShelfAlignmentPref(profile_->GetPrefs(),
-                                       GetDisplayIDForShelf(shelf),
-                                       shelf->wm_shelf()->alignment());
+void ChromeLauncherControllerImpl::OnShelfAlignmentChanged(
+    ash::WmShelf* shelf) {
+  ash::launcher::SetShelfAlignmentPref(
+      profile_->GetPrefs(), GetDisplayIDForShelf(shelf), shelf->alignment());
 }
 
 void ChromeLauncherControllerImpl::OnShelfAutoHideBehaviorChanged(
-    ash::Shelf* shelf) {
-  ash::launcher::SetShelfAutoHideBehaviorPref(
-      profile_->GetPrefs(), GetDisplayIDForShelf(shelf),
-      shelf->wm_shelf()->auto_hide_behavior());
+    ash::WmShelf* shelf) {
+  ash::launcher::SetShelfAutoHideBehaviorPref(profile_->GetPrefs(),
+                                              GetDisplayIDForShelf(shelf),
+                                              shelf->auto_hide_behavior());
 }
 
 void ChromeLauncherControllerImpl::OnShelfAutoHideStateChanged(
-    ash::Shelf* shelf) {}
+    ash::WmShelf* shelf) {}
 
 void ChromeLauncherControllerImpl::OnShelfVisibilityStateChanged(
-    ash::Shelf* shelf) {}
+    ash::WmShelf* shelf) {}
 
 ash::ShelfID ChromeLauncherControllerImpl::GetShelfIDForAppID(
     const std::string& app_id) {
   for (IDToItemControllerMap::const_iterator i =
            id_to_item_controller_map_.begin();
        i != id_to_item_controller_map_.end(); ++i) {
     if (i->second->type() == LauncherItemController::TYPE_APP_PANEL)
       continue;  // Don't include panels
     if (i->second->app_id() == app_id)
       return i->first;
@@ skipping 403 matching lines @@
     }
   }
 }
 
 void ChromeLauncherControllerImpl::SetShelfAutoHideBehaviorFromPrefs() {
   for (ash::WmWindow* window : ash::WmShell::Get()->GetAllRootWindows()) {
     ash::Shelf* shelf = ash::Shelf::ForWindow(window);
     if (shelf) {
       shelf->wm_shelf()->SetAutoHideBehavior(
           ash::launcher::GetShelfAutoHideBehaviorPref(
-              profile_->GetPrefs(), GetDisplayIDForShelf(shelf)));
+              profile_->GetPrefs(), GetDisplayIDForShelf(shelf->wm_shelf())));
     }
   }
 }
 
 void ChromeLauncherControllerImpl::SetShelfAlignmentFromPrefs() {
   if (!ash::ShelfWidget::ShelfAlignmentAllowed())
     return;
 
   for (ash::WmWindow* window : ash::WmShell::Get()->GetAllRootWindows()) {
     ash::Shelf* shelf = ash::Shelf::ForWindow(window);
     if (shelf) {
       shelf->wm_shelf()->SetAlignment(ash::launcher::GetShelfAlignmentPref(
-          profile_->GetPrefs(), GetDisplayIDForShelf(shelf)));
+          profile_->GetPrefs(), GetDisplayIDForShelf(shelf->wm_shelf())));
     }
   }
 }
 
 void ChromeLauncherControllerImpl::SetShelfBehaviorsFromPrefs() {
   SetShelfAutoHideBehaviorFromPrefs();
   SetShelfAlignmentFromPrefs();
 }
 
 void ChromeLauncherControllerImpl::SetVirtualKeyboardBehaviorFromPrefs() {
@@ skipping 340 matching lines @@
     if (index == -1)
       continue;
     ash::ShelfItem item = model_->items()[index];
     item.image = image;
     if (arc_deferred_launcher_)
       arc_deferred_launcher_->MaybeApplySpinningEffect(id, &item.image);
     model_->Set(index, item);
     // It's possible we're waiting on more than one item, so don't break.
   }
 }