summaryrefslogtreecommitdiffstats
path: root/ui/app_list
diff options
context:
space:
mode:
authormgiuca@chromium.org <mgiuca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-09 12:03:28 +0000
committermgiuca@chromium.org <mgiuca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-09 12:03:28 +0000
commit2c7e41c4d957203f5507256b30e0283ab80bcbbb (patch)
tree0fa00b92c89048db3618aeee162d0b63be52ebb1 /ui/app_list
parentc522f4bc0a8754ddc5387acb4fd4e6b235bbf5a9 (diff)
downloadchromium_src-2c7e41c4d957203f5507256b30e0283ab80bcbbb.zip
chromium_src-2c7e41c4d957203f5507256b30e0283ab80bcbbb.tar.gz
chromium_src-2c7e41c4d957203f5507256b30e0283ab80bcbbb.tar.bz2
Windows: Top-level bubbles no longer appear on taskbar by default.
On Windows, Widget::InitParams::force_show_in_taskbar is now respected, so it is possible to override the default without having to directly set HWND properties. This should not change any behaviour (just a refactor). Previously, we had a special case where the message center would turn off showing in taskbar, and app launcher would turn it off for <= Vista. Now we have just one special case: app launcher turns it on for >= Win7. BUG=332277 Review URL: https://codereview.chromium.org/127133003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243857 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/app_list')
-rw-r--r--ui/app_list/views/app_list_view.cc9
1 files changed, 8 insertions, 1 deletions
diff --git a/ui/app_list/views/app_list_view.cc b/ui/app_list/views/app_list_view.cc
index 4101472..aeb8e36 100644
--- a/ui/app_list/views/app_list_view.cc
+++ b/ui/app_list/views/app_list_view.cc
@@ -6,6 +6,7 @@
#include "base/command_line.h"
#include "base/strings/string_util.h"
+#include "base/win/windows_version.h"
#include "ui/app_list/app_list_constants.h"
#include "ui/app_list/app_list_model.h"
#include "ui/app_list/app_list_view_delegate.h"
@@ -325,7 +326,13 @@ void AppListView::OnBeforeBubbleWidgetInit(
if (delegate_ && delegate_->ForceNativeDesktop())
params->native_widget = new views::DesktopNativeWidgetAura(widget);
#endif
-#if defined(OS_LINUX)
+#if defined(OS_WIN)
+ // Windows 7 and higher offer pinning to the taskbar, but we need presence
+ // on the taskbar for the user to be able to pin us. So, show the window on
+ // the taskbar for these versions of Windows.
+ if (base::win::GetVersion() >= base::win::VERSION_WIN7)
+ params->force_show_in_taskbar = true;
+#elif defined(OS_LINUX)
// Set up a custom WM_CLASS for the app launcher window. This allows task
// switchers in X11 environments to distinguish it from main browser windows.
params->wm_class_name = kAppListWMClass;