ash: Rename LauncherModel to ShelfModel.

chrome/browser/ui/ash/launcher/chrome_launcher_controller.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_
 #define CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_
 
 #include <list>
 #include <map>
 #include <set>
@@ skipping 30 matching lines @@
 class BrowserStatusMonitor;
 class ExtensionEnableFlow;
 class GURL;
 class LauncherItemController;
 class Profile;
 class ShellWindowLauncherController;
 class TabContents;
 
 namespace ash {
 class LauncherItemDelegateManager;
-class LauncherModel;
+class ShelfModel;
 }
 
 namespace aura {
 class Window;
 }
 
 namespace content {
 class WebContents;
 }
 
@@ skipping 61 matching lines @@
     // Returns true if |id| is valid for the currently active profile.
     // Used during restore to ignore no longer valid extensions.
     // Note that already running applications are ignored by the restore
     // process.
     virtual bool IsValidIDForCurrentUser(const std::string& id) = 0;
 
     // Sets the currently active profile for the usage of |GetAppID|.
     virtual void SetCurrentUser(Profile* profile) = 0;
   };
 
-  ChromeLauncherController(Profile* profile, ash::LauncherModel* model);
+  ChromeLauncherController(Profile* profile, ash::ShelfModel* model);
   virtual ~ChromeLauncherController();
 
   // Initializes this ChromeLauncherController.
   void Init();
 
   // Creates an instance.
   static ChromeLauncherController* CreateInstance(Profile* profile,
-                                                  ash::LauncherModel* model);
+                                                  ash::ShelfModel* model);
 
   // Returns the single ChromeLauncherController instance.
   static ChromeLauncherController* instance() { return instance_; }
 
   // Creates a new app item on the launcher for |controller|.
   ash::LauncherID CreateAppLauncherItem(LauncherItemController* controller,
                                         const std::string& app_id,
                                         ash::LauncherItemStatus status);
 
   // Updates the running status of an item. It will also update the status of
@@ skipping 85 matching lines @@
 
   // Invoked when the user clicks on button in the launcher to create a new
   // incognito window.
   void CreateNewIncognitoWindow();
 
   // Updates the pinned pref state. The pinned state consists of a list pref.
   // Each item of the list is a dictionary. The key |kAppIDPath| gives the
   // id of the app.
   void PersistPinnedState();
 
-  ash::LauncherModel* model();
+  ash::ShelfModel* model();
 
   // Accessor to the currently loaded profile. Note that in multi profile use
   // cases this might change over time.
   Profile* profile();
 
   // Gets the shelf auto-hide behavior on |root_window|.
   ash::ShelfAutoHideBehavior GetShelfAutoHideBehavior(
       aura::Window* root_window) const;
 
   // Returns |true| if the user is allowed to modify the shelf auto-hide
@@ skipping 200 matching lines @@
   void SetShelfAlignmentFromPrefs();
 
   // Sets both of auto-hide behavior and alignment from prefs.
   void SetShelfBehaviorsFromPrefs();
 
   // Returns the most recently active web contents for an app.
   content::WebContents* GetLastActiveWebContents(const std::string& app_id);
 
   // Creates an app launcher to insert at |index|. Note that |index| may be
   // adjusted by the model to meet ordering constraints.
-  // The |launcher_item_type| will be set into the LauncherModel.
+  // The |launcher_item_type| will be set into the ShelfModel.
   ash::LauncherID InsertAppLauncherItem(
       LauncherItemController* controller,
       const std::string& app_id,
       ash::LauncherItemStatus status,
       int index,
       ash::LauncherItemType launcher_item_type);
 
   bool HasItemController(ash::LauncherID id) const;
 
   // Enumerate all Web contents which match a given shortcut |controller|.
@@ skipping 49 matching lines @@
   // Forget the current profile to allow attaching to a new one.
   void ReleaseProfile();
 
   // Returns true if |app_id| is a Packaged App that has already launched on the
   // native desktop and, if so, executes it as a desktop shortcut to activate
   // desktop mode and send another OnLaunched event to the Extension.
   bool LaunchedInNativeDesktop(const std::string& app_id);
 
   static ChromeLauncherController* instance_;
 
-  ash::LauncherModel* model_;
+  ash::ShelfModel* model_;
 
   ash::LauncherItemDelegateManager* item_delegate_manager_;
 
   // Profile used for prefs and loading extensions. This is NOT necessarily the
   // profile new windows are created with.
   Profile* profile_;
 
   IDToItemControllerMap id_to_item_controller_map_;
 
   // Maintains activation order of web contents for each app.
@@ skipping 31 matching lines @@
   // If true, incoming pinned state changes should be ignored.
   bool ignore_persist_pinned_state_change_;
 
   // True if each user has an own desktop.
   bool multi_profile_desktop_separation_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeLauncherController);
 };
 
 #endif  // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_