diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-16 21:15:48 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-16 21:15:48 +0000 |
| commit | 32a66aed0e57642c8f0da0a4a34383bbc9250a32 (patch) | |
| tree | 68d9c7919f9d148cfa8a2537f734143db7e6e94f /chrome/browser/views | |
| parent | f8bddcfb577500d541351efa8986cc89d8859d02 (diff) | |
| download | chromium_src-32a66aed0e57642c8f0da0a4a34383bbc9250a32.zip chromium_src-32a66aed0e57642c8f0da0a4a34383bbc9250a32.tar.gz chromium_src-32a66aed0e57642c8f0da0a4a34383bbc9250a32.tar.bz2 | |
window.cc should not include browser_list.h ... dependent (non-browser) windows are closed when they receive a notification rather than by being called directly from BrowserList. Also browser_list.cc should not include window.h, required for porting.
TEST=Open browser. Open options dialog box. Close browser. Options dialog should close too.
Review URL: http://codereview.chromium.org/18328
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8217 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views')
| -rw-r--r-- | chrome/browser/views/frame/aero_glass_frame.h | 3 | ||||
| -rw-r--r-- | chrome/browser/views/frame/opaque_frame.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/views/frame/aero_glass_frame.h b/chrome/browser/views/frame/aero_glass_frame.h index 7daa04a..4ff6288 100644 --- a/chrome/browser/views/frame/aero_glass_frame.h +++ b/chrome/browser/views/frame/aero_glass_frame.h @@ -53,8 +53,9 @@ class AeroGlassFrame : public BrowserFrame, virtual LRESULT OnNCCalcSize(BOOL mode, LPARAM l_param); virtual LRESULT OnNCHitTest(const CPoint& pt); - // Overridden from views::CustomFrameWindow: + // Overridden from views::Window: virtual int GetShowState() const; + virtual bool IsAppWindow() const { return true; } private: // Updates the DWM with the frame bounds. diff --git a/chrome/browser/views/frame/opaque_frame.h b/chrome/browser/views/frame/opaque_frame.h index 13c20d2..e5d2f552 100644 --- a/chrome/browser/views/frame/opaque_frame.h +++ b/chrome/browser/views/frame/opaque_frame.h @@ -43,6 +43,7 @@ class OpaqueFrame : public BrowserFrame, // Overridden from views::CustomFrameWindow: virtual void UpdateWindowIcon(); virtual int GetShowState() const; + virtual bool IsAppWindow() const { return true; } // Overridden from views::WidgetWin: virtual bool AcceleratorPressed(views::Accelerator* accelerator); |