diff options
| author | benwells@chromium.org <benwells@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-22 17:33:21 +0000 |
|---|---|---|
| committer | benwells@chromium.org <benwells@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-22 17:33:21 +0000 |
| commit | 7ea40954cd6390f277617c987897e7671a4a4d66 (patch) | |
| tree | afccb1f8537c7a37ed7b32084f193c68f6cb4f41 | |
| parent | 55f229063ea1e91f0742ab609b5d60364819df72 (diff) | |
| download | chromium_src-7ea40954cd6390f277617c987897e7671a4a4d66.zip chromium_src-7ea40954cd6390f277617c987897e7671a4a4d66.tar.gz chromium_src-7ea40954cd6390f277617c987897e7671a4a4d66.tar.bz2 | |
Fixed transparent app windows on Windows.
These were broken due to the WS_CAPTION style always being applied. Now
the style is not applied if the window has transparency enabled.
BUG=373541
Review URL: https://codereview.chromium.org/295933011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272219 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/ui/views/apps/chrome_native_app_window_views_win.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/ui/views/apps/chrome_native_app_window_views_win.cc b/chrome/browser/ui/views/apps/chrome_native_app_window_views_win.cc index ad4d8ac..b100703 100644 --- a/chrome/browser/ui/views/apps/chrome_native_app_window_views_win.cc +++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views_win.cc @@ -182,7 +182,8 @@ void ChromeNativeAppWindowViewsWin::InitializeDefaultWindow( base::Bind(&ChromeNativeAppWindowViewsWin::OnShortcutInfoLoaded, weak_ptr_factory_.GetWeakPtr())); - EnsureCaptionStyleSet(); + if (!create_params.transparent_background) + EnsureCaptionStyleSet(); UpdateShelfMenu(); } |