diff options
| author | tapted@chromium.org <tapted@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-15 09:42:46 +0000 |
|---|---|---|
| committer | tapted@chromium.org <tapted@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-15 09:42:46 +0000 |
| commit | 4b94d2faa7c5a1d7902f7fa977cf4479a39a9047 (patch) | |
| tree | 3bbcd701bf8ac1c9a8a2be0640ef26f9c80ff459 /chrome/browser/ui/ash/app_list | |
| parent | db815f390d6eadd5e404b20d28e545923aead2a1 (diff) | |
| download | chromium_src-4b94d2faa7c5a1d7902f7fa977cf4479a39a9047.zip chromium_src-4b94d2faa7c5a1d7902f7fa977cf4479a39a9047.tar.gz chromium_src-4b94d2faa7c5a1d7902f7fa977cf4479a39a9047.tar.bz2 | |
[win] Set the profile path when enabling the app launcher.
On windows, when enabling the app launcher for the first time via the
webstore the app launcher is not shown, and if you switch to a different
profile and exit the browser before activiating the app launcher for the
first time, it can show a different profile.
This passes the profile responsible for enabling the app launcher
through to platform-specific enabling code, which then ensures the
profile path is saved to the local prefs.
BUG=259654
TEST=On windows, in a fresh user-data-dir, make two users and leave
browser windows open. Install an app from the webstore using the second
user after signing in. Close that browser. Close the first browser.
Launch the app launcher. Launcher should show the second user, with
apps, and not a sign in page for the first user.
TBR=xiyuan@chromium.org
Review URL: https://chromiumcodereview.appspot.com/18421007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211624 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/ash/app_list')
| -rw-r--r-- | chrome/browser/ui/ash/app_list/app_list_service_ash.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/ui/ash/app_list/app_list_service_ash.cc b/chrome/browser/ui/ash/app_list/app_list_service_ash.cc index 64ad3fe..4303770 100644 --- a/chrome/browser/ui/ash/app_list/app_list_service_ash.cc +++ b/chrome/browser/ui/ash/app_list/app_list_service_ash.cc @@ -31,7 +31,7 @@ class AppListServiceAsh : public AppListServiceImpl { virtual void ShowAppList(Profile* default_profile) OVERRIDE; virtual bool IsAppListVisible() const OVERRIDE; virtual void DismissAppList() OVERRIDE; - virtual void EnableAppList() OVERRIDE; + virtual void EnableAppList(Profile* initial_profile) OVERRIDE; virtual gfx::NativeWindow GetAppListWindow() OVERRIDE; DISALLOW_COPY_AND_ASSIGN(AppListServiceAsh); @@ -59,7 +59,7 @@ void AppListServiceAsh::DismissAppList() { ash::Shell::GetInstance()->ToggleAppList(NULL); } -void AppListServiceAsh::EnableAppList() {} +void AppListServiceAsh::EnableAppList(Profile* initial_profile) {} gfx::NativeWindow AppListServiceAsh::GetAppListWindow() { if (ash::Shell::HasInstance()) |