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

Side by Side Diff: ui/views/window/non_client_view.cc

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/window/non_client_view.h ('k') | no next file » | 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 #include "ui/views/window/non_client_view.h" 5 #include "ui/views/window/non_client_view.h"
6 6
7 #include "ui/base/accessibility/accessible_view_state.h" 7 #include "ui/base/accessibility/accessible_view_state.h"
8 #include "ui/base/hit_test.h" 8 #include "ui/base/hit_test.h"
9 #include "ui/views/widget/root_view.h" 9 #include "ui/views/widget/root_view.h"
10 #include "ui/views/widget/widget.h" 10 #include "ui/views/widget/widget.h"
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 int NonClientView::NonClientHitTest(const gfx::Point& point) { 80 int NonClientView::NonClientHitTest(const gfx::Point& point) {
81 // The NonClientFrameView is responsible for also asking the ClientView. 81 // The NonClientFrameView is responsible for also asking the ClientView.
82 return frame_view_->NonClientHitTest(point); 82 return frame_view_->NonClientHitTest(point);
83 } 83 }
84 84
85 void NonClientView::GetWindowMask(const gfx::Size& size, 85 void NonClientView::GetWindowMask(const gfx::Size& size,
86 gfx::Path* window_mask) { 86 gfx::Path* window_mask) {
87 frame_view_->GetWindowMask(size, window_mask); 87 frame_view_->GetWindowMask(size, window_mask);
88 } 88 }
89 89
90 void NonClientView::EnableClose(bool enable) {
91 frame_view_->EnableClose(enable);
92 }
93
94 void NonClientView::ResetWindowControls() { 90 void NonClientView::ResetWindowControls() {
95 frame_view_->ResetWindowControls(); 91 frame_view_->ResetWindowControls();
96 } 92 }
97 93
98 void NonClientView::UpdateWindowIcon() { 94 void NonClientView::UpdateWindowIcon() {
99 frame_view_->UpdateWindowIcon(); 95 frame_view_->UpdateWindowIcon();
100 } 96 }
101 97
102 void NonClientView::LayoutFrameView() { 98 void NonClientView::LayoutFrameView() {
103 // First layout the NonClientFrameView, which determines the size of the 99 // First layout the NonClientFrameView, which determines the size of the
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
267 std::string NonClientFrameView::GetClassName() const { 263 std::string NonClientFrameView::GetClassName() const {
268 return kViewClassName; 264 return kViewClassName;
269 } 265 }
270 266
271 void NonClientFrameView::OnBoundsChanged(const gfx::Rect& previous_bounds) { 267 void NonClientFrameView::OnBoundsChanged(const gfx::Rect& previous_bounds) {
272 // Overridden to do nothing. The NonClientView manually calls Layout on the 268 // Overridden to do nothing. The NonClientView manually calls Layout on the
273 // FrameView when it is itself laid out, see comment in NonClientView::Layout. 269 // FrameView when it is itself laid out, see comment in NonClientView::Layout.
274 } 270 }
275 271
276 } // namespace views 272 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/window/non_client_view.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698