ash: Rename LauncherModel to ShelfModel.

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 <vector>
 
 #include "ash/ash_switches.h"
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/launcher/launcher.h"
 #include "ash/launcher/launcher_item_delegate_manager.h"
-#include "ash/launcher/launcher_model.h"
 #include "ash/multi_profile_uma.h"
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf_layout_manager.h"
+#include "ash/shelf/shelf_model.h"
 #include "ash/shelf/shelf_model_util.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/wm/window_util.h"
 #include "base/command_line.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/app_mode/app_mode_utils.h"
@@ skipping 286 matching lines @@
 
 void ChromeLauncherControllerUserSwitchObserverChromeOS::AddUser(
     Profile* profile) {
   if (chrome::MultiUserWindowManager::GetMultiProfileMode() ==
           chrome::MultiUserWindowManager::MULTI_PROFILE_MODE_SEPARATED)
     chrome::MultiUserWindowManager::GetInstance()->AddUser(profile);
   controller_->AdditionalUserAddedToSession(profile->GetOriginalProfile());
 }
 #endif
 
-ChromeLauncherController::ChromeLauncherController(
-    Profile* profile,
-    ash::LauncherModel* model)
+ChromeLauncherController::ChromeLauncherController(Profile* profile,
+                                                   ash::ShelfModel* model)
     : model_(model),
       item_delegate_manager_(NULL),
       profile_(profile),
       app_sync_ui_state_(NULL),
       ignore_persist_pinned_state_change_(false) {
   if (!profile_) {
     // Use the original profile as on chromeos we may get a temporary off the
     // record profile.
     profile_ = ProfileManager::GetDefaultProfile()->GetOriginalProfile();
 
@@ skipping 90 matching lines @@
   if (instance_ == this)
     instance_ = NULL;
 
   // Get rid of the multi user window manager instance.
   chrome::MultiUserWindowManager::DeleteInstance();
 }
 
 // static
 ChromeLauncherController* ChromeLauncherController::CreateInstance(
     Profile* profile,
-    ash::LauncherModel* model) {
+    ash::ShelfModel* model) {
   // We do not check here for re-creation of the ChromeLauncherController since
   // it appears that it might be intentional that the ChromeLauncherController
   // can be re-created.
   instance_ = new ChromeLauncherController(profile, model);
   return instance_;
 }
 
 void ChromeLauncherController::Init() {
   CreateBrowserShortcutLauncherItem();
   UpdateAppLaunchersFromPref();
@@ skipping 427 matching lines @@
           updater->Append(app_value);
       }
     }
   }
   pref_change_registrar_.Add(
       prefs::kPinnedLauncherApps,
       base::Bind(&ChromeLauncherController::UpdateAppLaunchersFromPref,
                  base::Unretained(this)));
 }
 
-ash::LauncherModel* ChromeLauncherController::model() {
+ash::ShelfModel* ChromeLauncherController::model() {
   return model_;
 }
 
 Profile* ChromeLauncherController::profile() {
   return profile_;
 }
 
 ash::ShelfAutoHideBehavior ChromeLauncherController::GetShelfAutoHideBehavior(
     aura::Window* root_window) const {
   // Don't show the shelf in app mode.
@@ skipping 353 matching lines @@
   MaybePropagatePrefToLocal(prefs,
                             prefs::kShelfAlignmentLocal,
                             prefs::kShelfAlignment);
   MaybePropagatePrefToLocal(prefs,
                             prefs::kShelfAutoHideBehaviorLocal,
                             prefs::kShelfAutoHideBehavior);
 }
 
 void ChromeLauncherController::OnAppSyncUIStatusChanged() {
   if (app_sync_ui_state_->status() == AppSyncUIState::STATUS_SYNCING)
-    model_->SetStatus(ash::LauncherModel::STATUS_LOADING);
+    model_->SetStatus(ash::ShelfModel::STATUS_LOADING);
   else
-    model_->SetStatus(ash::LauncherModel::STATUS_NORMAL);
+    model_->SetStatus(ash::ShelfModel::STATUS_NORMAL);
 }
 
 void ChromeLauncherController::ExtensionEnableFlowFinished() {
   LaunchApp(extension_enable_flow_->extension_id(),
             ash::LAUNCH_FROM_UNKNOWN,
             ui::EF_NONE);
   extension_enable_flow_.reset();
 }
 
 void ChromeLauncherController::ExtensionEnableFlowAborted(bool user_initiated) {
@@ skipping 191 matching lines @@
 
 int ChromeLauncherController::PinRunningAppInternal(
     int index,
     ash::LauncherID launcher_id) {
   int running_index = model_->ItemIndexByID(launcher_id);
   ash::LauncherItem item = model_->items()[running_index];
   DCHECK(item.type == ash::TYPE_WINDOWED_APP ||
          item.type == ash::TYPE_PLATFORM_APP);
   item.type = ash::TYPE_APP_SHORTCUT;
   model_->Set(running_index, item);
-  // The |LauncherModel|'s weight system might reposition the item to a
+  // The |ShelfModel|'s weight system might reposition the item to a
   // new index, so we get the index again.
   running_index = model_->ItemIndexByID(launcher_id);
   if (running_index < index)
     --index;
   if (running_index != index)
     model_->Move(running_index, index);
   return index;
 }
 
 void ChromeLauncherController::UnpinRunningAppInternal(int index) {
@@ skipping 533 matching lines @@
 }
 
 void ChromeLauncherController::ReleaseProfile() {
   if (app_sync_ui_state_)
     app_sync_ui_state_->RemoveObserver(this);
 
   PrefServiceSyncable::FromProfile(profile_)->RemoveObserver(this);
 
   pref_change_registrar_.RemoveAll();
 }