diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-20 18:26:36 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-20 18:26:36 +0000 |
| commit | 02b9cd6fa95f4797bb23dff09ac5a0a0529f2e9c (patch) | |
| tree | c9d1378a22acc3363c15ae96a42722c4a3c6f382 /chrome/browser/views/frame | |
| parent | dfb96df122af2da6adc25320742ae44aede063de (diff) | |
| download | chromium_src-02b9cd6fa95f4797bb23dff09ac5a0a0529f2e9c.zip chromium_src-02b9cd6fa95f4797bb23dff09ac5a0a0529f2e9c.tar.gz chromium_src-02b9cd6fa95f4797bb23dff09ac5a0a0529f2e9c.tar.bz2 | |
Revert "revert r8217 until memory tests are fixed." This re-applies r8217.
This reverts commit r8245.
TBR=ben
Review URL: http://codereview.chromium.org/18410
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8292 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/frame')
| -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); |