Use mojo Shelf interfaces for both mash and classic ash.

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

 // Copyright 2016 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/arc_app_window_launcher_controller.h"
 
 #include <string>
 
 #include "ash/aura/wm_window_aura.h"
 #include "ash/common/shelf/shelf_delegate.h"
 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
@@ skipping 241 matching lines @@
   ArcAppWindowLauncherItemController* controller_ = nullptr;
   // Unowned pointer, represents host Arc window.
 
   DISALLOW_COPY_AND_ASSIGN(AppWindow);
 };
 
 ArcAppWindowLauncherController::ArcAppWindowLauncherController(
     ChromeLauncherController* owner,
     ash::ShelfDelegate* shelf_delegate)
     : AppWindowLauncherController(owner), shelf_delegate_(shelf_delegate) {
-  if (arc::ArcAuthService::IsAllowedForProfile(owner->GetProfile())) {
-    observed_profile_ = owner->GetProfile();
+  if (arc::ArcAuthService::IsAllowedForProfile(owner->profile())) {
+    observed_profile_ = owner->profile();
     StartObserving(observed_profile_);
   }
 }
 
 ArcAppWindowLauncherController::~ArcAppWindowLauncherController() {
   if (observed_profile_)
     StopObserving(observed_profile_);
   if (observing_shell_)
     ash::WmShell::Get()->RemoveShellObserver(this);
 }
@@ skipping 69 matching lines @@
     chrome::MultiUserWindowManager::GetInstance()->SetWindowOwner(
         window,
         user_manager::UserManager::Get()->GetPrimaryUser()->GetAccountId());
   }
 
   // The application id property should be set at this time. It is important to
   // have window->IsVisible set to true before attaching to a controller because
   // the window is registered in multi-user manager and this manager may
   // consider this new window as hidden for current profile. Multi-user manager
   // uses OnWindowVisibilityChanging event to update window state.
-  if (visible && observed_profile_ == owner()->GetProfile())
+  if (visible && observed_profile_ == owner()->profile())
     AttachControllerToWindowIfNeeded(window);
 }
 
 void ArcAppWindowLauncherController::OnWindowDestroying(aura::Window* window) {
   auto it =
       std::find(observed_windows_.begin(), observed_windows_.end(), window);
   DCHECK(it != observed_windows_.end());
   observed_windows_.erase(it);
   window->RemoveObserver(this);
 
@@ skipping 104 matching lines @@
     int task_id,
     const std::string& package_name,
     const std::string& activity_name) {
   DCHECK(!GetAppWindowForTask(task_id));
   const std::string arc_app_id =
       ArcAppListPrefs::GetAppId(package_name, activity_name);
   const std::string shelf_app_id = GetShelfAppIdFromArcAppId(arc_app_id);
   task_id_to_app_window_info_[task_id] =
       base::MakeUnique<AppWindowInfo>(shelf_app_id);
   // Don't create shelf icon for non-primary user.
-  if (observed_profile_ != owner()->GetProfile())
+  if (observed_profile_ != owner()->profile())
     return;
 
   AttachControllerToWindowsIfNeeded();
 
   // Some tasks can be started in background and might have no window until
   // pushed to the front. We need its representation on the shelf to give a user
   // control over it.
   AttachControllerToTask(shelf_app_id, task_id);
 }
 
@@ skipping 14 matching lines @@
     if (!controller->window_count()) {
       owner()->CloseLauncherItem(controller->shelf_id());
       app_controller_map_.erase(it_controller);
     }
   }
 
   task_id_to_app_window_info_.erase(it);
 }
 
 void ArcAppWindowLauncherController::OnTaskSetActive(int32_t task_id) {
-  if (observed_profile_ != owner()->GetProfile()) {
+  if (observed_profile_ != owner()->profile()) {
     active_task_id_ = task_id;
     return;
   }
 
   AppWindow* previous_app_window = GetAppWindowForTask(active_task_id_);
   if (previous_app_window) {
     owner()->SetItemStatus(previous_app_window->shelf_id(),
                            ash::STATUS_RUNNING);
     previous_app_window->SetFullscreenMode(
         previous_app_window->widget() &&
@@ skipping 192 matching lines @@
 
   if (orientation_lock == arc::mojom::OrientationLock::CURRENT) {
     // Resolve the orientation when it first resolved.
     orientation_lock = GetCurrentOrientation();
     info->set_requested_orientation_lock(orientation_lock);
   }
   ash::Shell* shell = ash::Shell::GetInstance();
   shell->screen_orientation_controller()->LockOrientationForWindow(
       window, BlinkOrientationLockFromMojom(orientation_lock));
 }