Fix compile failures from shelf locking merge CL.

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 1136 matching lines @@
       GetShelfAutoHideBehaviorFromPrefs(profile_, root_window));
 
   if (ash::ShelfWidget::ShelfAlignmentAllowed())
     shelf->SetAlignment(GetShelfAlignmentFromPrefs(profile_, root_window));
 }
 
 void ChromeLauncherController::OnShelfDestroyed(ash::Shelf* shelf) {}
 
 void ChromeLauncherController::OnShelfAlignmentChanged(ash::Shelf* shelf) {
   const char* value = nullptr;
-  switch (shelf->GetAlignment()) {
+  switch (shelf->alignment()) {
     case ash::SHELF_ALIGNMENT_BOTTOM:
       value = ash::kShelfAlignmentBottom;
       break;
     case ash::SHELF_ALIGNMENT_LEFT:
       value = ash::kShelfAlignmentLeft;
       break;
     case ash::SHELF_ALIGNMENT_RIGHT:
       value = ash::kShelfAlignmentRight;
       break;
     case ash::SHELF_ALIGNMENT_BOTTOM_LOCKED:
@@ skipping 1064 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;
 }