diff options
| author | mad@chromium.org <mad@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-27 22:12:58 +0000 |
|---|---|---|
| committer | mad@chromium.org <mad@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-27 22:12:58 +0000 |
| commit | d5fbc00d5d55132f03f229f3dba001fc62ee6795 (patch) | |
| tree | cbcb664bf2fd23a48395dcdb730e32352c5f6525 /chrome/browser/views | |
| parent | 81fa3a476c24ff3d021019f441243cbea96497e0 (diff) | |
| download | chromium_src-d5fbc00d5d55132f03f229f3dba001fc62ee6795.zip chromium_src-d5fbc00d5d55132f03f229f3dba001fc62ee6795.tar.gz chromium_src-d5fbc00d5d55132f03f229f3dba001fc62ee6795.tar.bz2 | |
When we open a popup window from an app window, we used to identify this popup window as an app too.
To not lose this functionality, yet fix bug 5739 about those app popup windows which would persist their window placement, I decided to add a new enum browser type item which is a bit combination of both popup and app so we can track those.
bug= http://crbug.com/5739
Review URL: http://codereview.chromium.org/28271
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10636 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views')
| -rw-r--r-- | chrome/browser/views/frame/browser_view.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc index 8ac669c..a8eaa63 100644 --- a/chrome/browser/views/frame/browser_view.cc +++ b/chrome/browser/views/frame/browser_view.cc @@ -984,7 +984,7 @@ bool BrowserView::ShouldShowWindowTitle() const { } SkBitmap BrowserView::GetWindowIcon() { - if (browser_->type() == Browser::TYPE_APP) + if (browser_->type() & Browser::TYPE_APP) return browser_->GetCurrentPageIcon(); return SkBitmap(); } @@ -1026,7 +1026,7 @@ void BrowserView::SaveWindowPlacement(const gfx::Rect& bounds, bool BrowserView::GetSavedWindowBounds(gfx::Rect* bounds) const { *bounds = browser_->GetSavedWindowBounds(); - if (browser_->type() == Browser::TYPE_POPUP) { + if (browser_->type() & Browser::TYPE_POPUP) { // We are a popup window. The value passed in |bounds| represents two // pieces of information: // - the position of the window, in screen coordinates (outer position). @@ -1303,7 +1303,7 @@ bool BrowserView::SupportsWindowFeature(WindowFeature feature) const { features |= FEATURE_TABSTRIP | FEATURE_TOOLBAR; else features |= FEATURE_TITLEBAR; - if (browser_->type() != Browser::TYPE_APP) + if ((browser_->type() & Browser::TYPE_APP) == 0) features |= FEATURE_LOCATIONBAR; } return !!(features & feature); |