chrome/browser/ui/views/frame/browser_non_client_frame_view_aura.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/browser_non_client_frame_view_aura.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/app_panel_browser_frame_view.cc ('k') | chrome/browser/ui/views/frame/browser_non_client_frame_view_aura.cc » ('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_BROWSER_NON_CLIENT_FRAME_VIEW_AURA_H_	5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_AURA_H_

6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_AURA_H_	6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_AURA_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_non_client_frame_view.h"	10 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h"

(...skipping 38 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
49 virtual int GetHorizontalTabStripVerticalOffset(bool restored) const OVERRIDE;	49 virtual int GetHorizontalTabStripVerticalOffset(bool restored) const OVERRIDE;

50 virtual void UpdateThrobber(bool running) OVERRIDE;	50 virtual void UpdateThrobber(bool running) OVERRIDE;

51	51

52 // views::NonClientFrameView overrides:	52 // views::NonClientFrameView overrides:

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

54 virtual gfx::Rect GetWindowBoundsForClientBounds(	54 virtual gfx::Rect GetWindowBoundsForClientBounds(

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

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

57 virtual void GetWindowMask(const gfx::Size& size,	57 virtual void GetWindowMask(const gfx::Size& size,

58 gfx::Path* window_mask) OVERRIDE;	58 gfx::Path* window_mask) OVERRIDE;

	59 virtual void EnableClose(bool enable) OVERRIDE;

59 virtual void ResetWindowControls() OVERRIDE;	60 virtual void ResetWindowControls() OVERRIDE;

60 virtual void UpdateWindowIcon() OVERRIDE;	61 virtual void UpdateWindowIcon() OVERRIDE;

61 virtual void ShouldPaintAsActiveChanged() OVERRIDE;	62 virtual void ShouldPaintAsActiveChanged() OVERRIDE;

62	63

63 // views::View overrides:	64 // views::View overrides:

64 virtual void Layout() OVERRIDE;	65 virtual void Layout() OVERRIDE;

65 virtual views::View* GetEventHandlerForPoint(	66 virtual views::View* GetEventHandlerForPoint(

66 const gfx::Point& point) OVERRIDE;	67 const gfx::Point& point) OVERRIDE;

67 virtual bool HitTest(const gfx::Point& p) const OVERRIDE;	68 virtual bool HitTest(const gfx::Point& p) const OVERRIDE;

68 virtual void OnMouseMoved(const views::MouseEvent& event) OVERRIDE;	69 virtual void OnMouseMoved(const views::MouseEvent& event) OVERRIDE;

(...skipping 13 matching lines...) Expand all Loading...
82	83

83 int last_hittest_code_;	84 int last_hittest_code_;

84 WindowControlButton* maximize_button_;	85 WindowControlButton* maximize_button_;

85 WindowControlButton* close_button_;	86 WindowControlButton* close_button_;

86 FrameBackground* frame_background_;	87 FrameBackground* frame_background_;

87	88

88 DISALLOW_COPY_AND_ASSIGN(BrowserNonClientFrameViewAura);	89 DISALLOW_COPY_AND_ASSIGN(BrowserNonClientFrameViewAura);

89 };	90 };

90	91

91 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_AURA_H_	92 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_AURA_H_

OLD	NEW