diff options
| author | jianli@chromium.org <jianli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-13 00:30:15 +0000 |
|---|---|---|
| committer | jianli@chromium.org <jianli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-13 00:30:15 +0000 |
| commit | b2508ce337f829013b900c7468c5f9b1190a2cb0 (patch) | |
| tree | 20716946a5a0d06430316ea4ffc79b1b1c76f7f6 /chrome/browser | |
| parent | 8cc7f627a11802b098fe4fc5775ffcb69c1a148d (diff) | |
| download | chromium_src-b2508ce337f829013b900c7468c5f9b1190a2cb0.zip chromium_src-b2508ce337f829013b900c7468c5f9b1190a2cb0.tar.gz chromium_src-b2508ce337f829013b900c7468c5f9b1190a2cb0.tar.bz2 | |
Fix bug 148435: Panels [WIN]: Refactored panels associated with wrong app in taskbar
BUG=148435
TEST=Manual test by creating panels and checking its app icon
Review URL: https://chromiumcodereview.appspot.com/10916265
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156435 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/ui/panels/panel_view.cc | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/chrome/browser/ui/panels/panel_view.cc b/chrome/browser/ui/panels/panel_view.cc index 6055f53..32fbd8e 100644 --- a/chrome/browser/ui/panels/panel_view.cc +++ b/chrome/browser/ui/panels/panel_view.cc @@ -6,7 +6,9 @@ #include <map> #include "base/logging.h" +#include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" +#include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/panels/panel.h" #include "chrome/browser/ui/panels/panel_bounds_animation.h" #include "chrome/browser/ui/panels/panel_frame_view.h" @@ -21,7 +23,9 @@ #include "ui/views/widget/widget.h" #if defined(OS_WIN) && !defined(USE_ASH) && !defined(USE_AURA) +#include "ui/base/win/shell.h" #include "base/win/windows_version.h" +#include "chrome/browser/shell_integration.h" #include "chrome/browser/ui/panels/taskbar_window_thumbnailer_win.h" #endif @@ -196,6 +200,13 @@ PanelView::PanelView(Panel* panel, const gfx::Rect& bounds) focus_manager->RegisterAccelerator( iter->first, ui::AcceleratorManager::kNormalPriority, this); } + +#if defined(OS_WIN) && !defined(USE_ASH) && !defined(USE_AURA) + ui::win::SetAppIdForWindow( + ShellIntegration::GetAppModelIdForProfile(UTF8ToWide(panel->app_name()), + panel->profile()->GetPath()), + window_->GetNativeWindow()); +#endif } PanelView::~PanelView() { |