diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-12 23:07:03 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-12 23:07:03 +0000 |
| commit | 35d0e11689c9e4c25a6b6e36f61924ad3f8334a9 (patch) | |
| tree | fdf5b73e58ea63e72d19ccde260d13b52ce14cdf /chrome/browser/ui/ash/app_list | |
| parent | f3449e0d1e40f616763379fa80e003263e29d336 (diff) | |
| download | chromium_src-35d0e11689c9e4c25a6b6e36f61924ad3f8334a9.zip chromium_src-35d0e11689c9e4c25a6b6e36f61924ad3f8334a9.tar.gz chromium_src-35d0e11689c9e4c25a6b6e36f61924ad3f8334a9.tar.bz2 | |
Ensure that the AppListController class which lives in app_list_controller_win.cc plays nice with AURA and ASH.
For ASH on Windows 8 we defer calls to open and hide the apps list to the ash Shell via the ToggleAppList member
function in the Shell class.
For AURA the fixes were mostly around retrieving the native window for the view appropriately, i.e via RootWindow::GetAcceleratedWidget
This also fixes the AppInstallConfirmation and AppInstallConfirmation_Incognito browser tests for AURA.
I added a class AppListControllerAsh which inherits from the AppListController class and
overrides the ShowAppList/DismissAppList functions to display the ASH specific app lists.
This also fixes the startup crash in desktop chrome observed when displaying the app list
as we were deferencing a NULL ash shell pointer.
The app_list_controller_ash.cc functionality is disabled for Windows and is provided by the newly
added AppListControllerAsh class which lives in the app_list_controller_win.cc file.
BUG=174940, 174399, 174504, 175389
TEST=covered by existing Browser tests for desktop chrome AURA.
Review URL: https://codereview.chromium.org/12210102
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182051 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_controller_ash.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/ui/ash/app_list/app_list_controller_ash.cc b/chrome/browser/ui/ash/app_list/app_list_controller_ash.cc index 51c9a24..73d1abd 100644 --- a/chrome/browser/ui/ash/app_list/app_list_controller_ash.cc +++ b/chrome/browser/ui/ash/app_list/app_list_controller_ash.cc @@ -65,6 +65,7 @@ void AppListControllerDelegateAsh::LaunchApp( DismissView(); } +#if !defined(OS_WIN) namespace chrome { // In the win_aura build these are defined in app_list_controller_win.cc. @@ -103,3 +104,4 @@ void NotifyAppListOfExtensionInstallFailure( } } // namespace chrome +#endif |