diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-26 02:41:14 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-26 02:41:14 +0000 |
| commit | 00fef5e55cd5bf3c30b6872862d7cea211d8d801 (patch) | |
| tree | dbf1f30f1ff290689cf04abbdedb96b2912482fd /chrome | |
| parent | f03262d2db7fa67d3baeb25e408acd1f093f4132 (diff) | |
| download | chromium_src-00fef5e55cd5bf3c30b6872862d7cea211d8d801.zip chromium_src-00fef5e55cd5bf3c30b6872862d7cea211d8d801.tar.gz chromium_src-00fef5e55cd5bf3c30b6872862d7cea211d8d801.tar.bz2 | |
Fix regression where popups and app frames lost their titlebars.
TBR=pkasting
http://crbug.com/25784
TEST=open any popup window or app frame, should have title bar to drag window.
Review URL: http://codereview.chromium.org/328026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30029 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/views/frame/browser_frame_win.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/browser/views/frame/browser_frame_win.cc b/chrome/browser/views/frame/browser_frame_win.cc index f9c1bbb..a732934 100644 --- a/chrome/browser/views/frame/browser_frame_win.cc +++ b/chrome/browser/views/frame/browser_frame_win.cc @@ -122,8 +122,12 @@ bool BrowserFrameWin::AlwaysUseNativeFrame() const { // BrowserFrame, views::WindowWin overrides: gfx::Insets BrowserFrameWin::GetClientAreaInsets() const { - if (!GetNonClientView()->UseNativeFrame()) + // Use the default client insets for an opaque frame or a glass popup/app + // frame. + if (!GetNonClientView()->UseNativeFrame() || + !browser_view_->IsBrowserTypeNormal()) { return WindowWin::GetClientAreaInsets(); + } int border_thickness = GetSystemMetrics(SM_CXSIZEFRAME); // We draw our own client edge over part of the default frame. |