| Index: chrome/browser/ui/views/ash/launcher/chrome_launcher_delegate.h
|
| diff --git a/chrome/browser/ui/views/ash/launcher/chrome_launcher_delegate.h b/chrome/browser/ui/views/ash/launcher/chrome_launcher_delegate.h
|
| index 2c3436f56bfc1fabec75c27125eff997af641791..0bb906e0c63d6413d701be79642d770bacec83f8 100644
|
| --- a/chrome/browser/ui/views/ash/launcher/chrome_launcher_delegate.h
|
| +++ b/chrome/browser/ui/views/ash/launcher/chrome_launcher_delegate.h
|
| @@ -72,9 +72,6 @@ class ChromeLauncherDelegate : public ash::LauncherDelegate,
|
| ChromeLauncherDelegate(Profile* profile, ash::LauncherModel* model);
|
| virtual ~ChromeLauncherDelegate();
|
|
|
| - // Initializes this ChromeLauncherDelegate.
|
| - void Init();
|
| -
|
| // Returns the single ChromeLauncherDelegate instnace.
|
| static ChromeLauncherDelegate* instance() { return instance_; }
|
|
|
| @@ -204,6 +201,10 @@ class ChromeLauncherDelegate : public ash::LauncherDelegate,
|
|
|
| typedef std::map<ash::LauncherID, Item> IDToItemMap;
|
|
|
| + // Initializes this ChromeLauncherDelegate. This is called after the
|
| + // NOTIFICATION_PROFILE_CREATED event.
|
| + void PostProfileInit();
|
| +
|
| // 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. |kAppTypePath| is one of |kAppTypeTab| or |kAppTypeWindow|
|
| @@ -213,9 +214,8 @@ class ChromeLauncherDelegate : public ash::LauncherDelegate,
|
| // Unpins any app items whose id is |app_id|.
|
| void UnpinAppsWithID(const std::string& app_id);
|
|
|
| - // Sets the AppIconLoader, taking ownership of |loader|. This is intended for
|
| - // testing.
|
| - void SetAppIconLoaderForTest(AppIconLoader* loader);
|
| + // Sets the AppIconLoader, taking ownership of |loader|.
|
| + void SetAppIconLoader(AppIconLoader* loader);
|
|
|
| // Returns the profile used for new windows.
|
| Profile* GetProfileForNewWindows();
|
|
|