arc: Support pinned apps across Arc-enabled and Arc-disabled platforms.

chrome/browser/ui/ash/launcher/chrome_mash_shelf_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/chrome_mash_shelf_controller.h"
 
 #include "chrome/browser/extensions/extension_app_icon_loader.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_icon_loader.h"
 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
@@ skipping 60 matching lines @@
 
 void ChromeMashShelfController::Init() {
   shell::Connector* connector =
       content::MojoShellConnection::GetForProcess()->GetConnector();
   connector->ConnectToInterface("mojo:ash_sysui", &shelf_controller_);
 
   // Set shelf alignment and auto-hide behavior from preferences.
   Profile* profile = ProfileManager::GetActiveUserProfile();
   int64_t display_id = display::Screen::GetScreen()->GetPrimaryDisplay().id();
   shelf_controller_->SetAlignment(static_cast<mash::shelf::mojom::Alignment>(
-      ash::GetShelfAlignmentPref(profile->GetPrefs(), display_id)));
+      ash::launcher::GetShelfAlignmentPref(profile->GetPrefs(), display_id)));
   shelf_controller_->SetAutoHideBehavior(
       static_cast<mash::shelf::mojom::AutoHideBehavior>(
-          ash::GetShelfAutoHideBehaviorPref(profile->GetPrefs(), display_id)));
+          ash::launcher::GetShelfAutoHideBehaviorPref(profile->GetPrefs(),
+                                                      display_id)));
 
   // TODO(skuhne): The AppIconLoaderImpl has the same problem. Each loaded
   // image is associated with a profile (its loader requires the profile).
   // Since icon size changes are possible, the icon could be requested to be
   // reloaded. However - having it not multi profile aware would cause problems
   // if the icon cache gets deleted upon user switch.
   std::unique_ptr<AppIconLoader> extension_app_icon_loader(
       new extensions::ExtensionAppIconLoader(
           profile, extension_misc::EXTENSION_ICON_SMALL, this));
   app_icon_loaders_.push_back(std::move(extension_app_icon_loader));
 
   if (arc::ArcAuthService::IsAllowedForProfile(profile)) {
     std::unique_ptr<AppIconLoader> arc_app_icon_loader(new ArcAppIconLoader(
         profile, extension_misc::EXTENSION_ICON_SMALL, this));
     app_icon_loaders_.push_back(std::move(arc_app_icon_loader));
   }
 
   PinAppsFromPrefs();
 
   // Start observing the shelf now that it has been initialized.
   mash::shelf::mojom::ShelfObserverAssociatedPtrInfo ptr_info;
   observer_binding_.Bind(&ptr_info, shelf_controller_.associated_group());
   shelf_controller_->AddObserver(std::move(ptr_info));
 }
 
 void ChromeMashShelfController::PinAppsFromPrefs() {
   Profile* profile = ProfileManager::GetActiveUserProfile();
   std::vector<std::string> pinned_apps =
-      ash::GetPinnedAppsFromPrefs(profile->GetPrefs(), &helper_);
+      ash::launcher::GetPinnedAppsFromPrefs(profile->GetPrefs(), &helper_);
 
   for (const auto& app : pinned_apps) {
-    if (app == ash::kPinnedAppsPlaceholder)
+    if (app == ash::launcher::kPinnedAppsPlaceholder)
       continue;
 
     mash::shelf::mojom::ShelfItemPtr item(mash::shelf::mojom::ShelfItem::New());
     item->app_id = app;
     item->app_title = mojo::String::From(helper_.GetAppTitle(profile, app));
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     const gfx::Image& image = rb.GetImageNamed(IDR_APP_DEFAULT_ICON);
     item->image = *image.ToSkBitmap();
     std::unique_ptr<ChromeShelfItemDelegate> delegate(
         new ChromeShelfItemDelegate(app, this));
@@ skipping 15 matching lines @@
   for (const auto& app_icon_loader : app_icon_loaders_) {
     if (app_icon_loader->CanLoadImageForApp(app_id))
       return app_icon_loader.get();
   }
 
   return nullptr;
 }
 
 void ChromeMashShelfController::OnAlignmentChanged(
     mash::shelf::mojom::Alignment alignment) {
-  ash::SetShelfAlignmentPref(
+  ash::launcher::SetShelfAlignmentPref(
       ProfileManager::GetActiveUserProfile()->GetPrefs(),
       display::Screen::GetScreen()->GetPrimaryDisplay().id(),
       static_cast<ash::ShelfAlignment>(alignment));
 }
 
 void ChromeMashShelfController::OnAutoHideBehaviorChanged(
     mash::shelf::mojom::AutoHideBehavior auto_hide) {
-  ash::SetShelfAutoHideBehaviorPref(
+  ash::launcher::SetShelfAutoHideBehaviorPref(
       ProfileManager::GetActiveUserProfile()->GetPrefs(),
       display::Screen::GetScreen()->GetPrimaryDisplay().id(),
       static_cast<ash::ShelfAutoHideBehavior>(auto_hide));
 }
 
 void ChromeMashShelfController::OnAppImageUpdated(const std::string& app_id,
                                                   const gfx::ImageSkia& image) {
   shelf_controller_->SetItemImage(app_id, *image.bitmap());
 }