chrome/browser/ui/views/frame/glass_browser_frame_view.h - Issue 8869005: Revert EnableClose() removal and related crash fixes. I don't understand the crashes here, and th...

Side by Side Diff: chrome/browser/ui/views/frame/glass_browser_frame_view.h

Issue 8869005: Revert EnableClose() removal and related crash fixes. I don't understand the crashes here, and th... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 9 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « chrome/browser/ui/views/frame/browser_non_client_frame_view_aura.cc ('k') | chrome/browser/ui/views/frame/opaque_browser_frame_view.h » ('j') | content/browser/gamepad/data_fetcher_win.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_GLASS_BROWSER_FRAME_VIEW_H_	5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_GLASS_BROWSER_FRAME_VIEW_H_

6 #define CHROME_BROWSER_UI_VIEWS_FRAME_GLASS_BROWSER_FRAME_VIEW_H_	6 #define CHROME_BROWSER_UI_VIEWS_FRAME_GLASS_BROWSER_FRAME_VIEW_H_

7 #pragma once	7 #pragma once

8	8

9 #include "base/memory/scoped_ptr.h"	9 #include "base/memory/scoped_ptr.h"

10 #include "chrome/browser/ui/views/frame/browser_frame_win.h"	10 #include "chrome/browser/ui/views/frame/browser_frame_win.h"

(...skipping 18 matching lines...) Expand all Loading...
29 virtual void UpdateThrobber(bool running) OVERRIDE;	29 virtual void UpdateThrobber(bool running) OVERRIDE;

30 virtual gfx::Size GetMinimumSize() OVERRIDE;	30 virtual gfx::Size GetMinimumSize() OVERRIDE;

31	31

32 // Overridden from views::NonClientFrameView:	32 // Overridden from views::NonClientFrameView:

33 virtual gfx::Rect GetBoundsForClientView() const OVERRIDE;	33 virtual gfx::Rect GetBoundsForClientView() const OVERRIDE;

34 virtual gfx::Rect GetWindowBoundsForClientBounds(	34 virtual gfx::Rect GetWindowBoundsForClientBounds(

35 const gfx::Rect& client_bounds) const OVERRIDE;	35 const gfx::Rect& client_bounds) const OVERRIDE;

36 virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE;	36 virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE;

37 virtual void GetWindowMask(const gfx::Size& size, gfx::Path* window_mask)	37 virtual void GetWindowMask(const gfx::Size& size, gfx::Path* window_mask)

38 OVERRIDE { }	38 OVERRIDE { }

	39 virtual void EnableClose(bool enable) OVERRIDE { }

39 virtual void ResetWindowControls() OVERRIDE { }	40 virtual void ResetWindowControls() OVERRIDE { }

40 virtual void UpdateWindowIcon() OVERRIDE { }	41 virtual void UpdateWindowIcon() OVERRIDE { }

41	42

42 protected:	43 protected:

43 // Overridden from views::View:	44 // Overridden from views::View:

44 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;	45 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;

45 virtual void Layout() OVERRIDE;	46 virtual void Layout() OVERRIDE;

46 virtual bool HitTest(const gfx::Point& l) const OVERRIDE;	47 virtual bool HitTest(const gfx::Point& l) const OVERRIDE;

47	48

48 private:	49 private:

(...skipping 51 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
100 content::NotificationRegistrar registrar_;	101 content::NotificationRegistrar registrar_;

101	102

102 static const int kThrobberIconCount = 24;	103 static const int kThrobberIconCount = 24;

103 static HICON throbber_icons_[kThrobberIconCount];	104 static HICON throbber_icons_[kThrobberIconCount];

104 static void InitThrobberIcons();	105 static void InitThrobberIcons();

105	106

106 DISALLOW_COPY_AND_ASSIGN(GlassBrowserFrameView);	107 DISALLOW_COPY_AND_ASSIGN(GlassBrowserFrameView);

107 };	108 };

108	109

109 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_GLASS_BROWSER_FRAME_VIEW_H_	110 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_GLASS_BROWSER_FRAME_VIEW_H_

OLD	NEW