Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(95)

Side by Side Diff: ui/views/window/custom_frame_view.h

Issue 8618001: Get rid of the EnableClose() infrastructure in Widget. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 1 month 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 | « ui/views/widget/widget.cc ('k') | ui/views/window/custom_frame_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 UI_VIEWS_WINDOW_CUSTOM_FRAME_VIEW_H_ 5 #ifndef UI_VIEWS_WINDOW_CUSTOM_FRAME_VIEW_H_
6 #define UI_VIEWS_WINDOW_CUSTOM_FRAME_VIEW_H_ 6 #define UI_VIEWS_WINDOW_CUSTOM_FRAME_VIEW_H_
7 #pragma once 7 #pragma once
8 8
9 #include "ui/views/widget/widget.h" 9 #include "ui/views/widget/widget.h"
10 #include "ui/views/window/non_client_view.h" 10 #include "ui/views/window/non_client_view.h"
(...skipping 23 matching lines...) Expand all
34 explicit CustomFrameView(Widget* frame); 34 explicit CustomFrameView(Widget* frame);
35 virtual ~CustomFrameView(); 35 virtual ~CustomFrameView();
36 36
37 // Overridden from NonClientFrameView: 37 // Overridden from NonClientFrameView:
38 virtual gfx::Rect GetBoundsForClientView() const OVERRIDE; 38 virtual gfx::Rect GetBoundsForClientView() const OVERRIDE;
39 virtual gfx::Rect GetWindowBoundsForClientBounds( 39 virtual gfx::Rect GetWindowBoundsForClientBounds(
40 const gfx::Rect& client_bounds) const OVERRIDE; 40 const gfx::Rect& client_bounds) const OVERRIDE;
41 virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE; 41 virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE;
42 virtual void GetWindowMask(const gfx::Size& size, gfx::Path* window_mask) 42 virtual void GetWindowMask(const gfx::Size& size, gfx::Path* window_mask)
43 OVERRIDE; 43 OVERRIDE;
44 virtual void EnableClose(bool enable) OVERRIDE;
45 virtual void ResetWindowControls() OVERRIDE; 44 virtual void ResetWindowControls() OVERRIDE;
46 virtual void UpdateWindowIcon() OVERRIDE; 45 virtual void UpdateWindowIcon() OVERRIDE;
47 46
48 // View overrides: 47 // View overrides:
49 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; 48 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
50 virtual void Layout() OVERRIDE; 49 virtual void Layout() OVERRIDE;
51 virtual gfx::Size GetPreferredSize() OVERRIDE; 50 virtual gfx::Size GetPreferredSize() OVERRIDE;
52 51
53 // ButtonListener implementation: 52 // ButtonListener implementation:
54 virtual void ButtonPressed(Button* sender, const views::Event& event) 53 virtual void ButtonPressed(Button* sender, const views::Event& event)
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 // Initialize various static resources. 117 // Initialize various static resources.
119 static void InitClass(); 118 static void InitClass();
120 static gfx::Font* title_font_; 119 static gfx::Font* title_font_;
121 120
122 DISALLOW_COPY_AND_ASSIGN(CustomFrameView); 121 DISALLOW_COPY_AND_ASSIGN(CustomFrameView);
123 }; 122 };
124 123
125 } // namespace views 124 } // namespace views
126 125
127 #endif // UI_VIEWS_WINDOW_CUSTOM_FRAME_VIEW_H_ 126 #endif // UI_VIEWS_WINDOW_CUSTOM_FRAME_VIEW_H_
OLDNEW
« no previous file with comments | « ui/views/widget/widget.cc ('k') | ui/views/window/custom_frame_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698