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

Side by Side Diff: ash/wm/panels/panel_frame_view.cc

Issue 553333007: [Ash] Always show minimize button. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove enum MinimizeAllowed. Created 6 years, 3 months 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "ash/wm/panels/panel_frame_view.h" 5 #include "ash/wm/panels/panel_frame_view.h"
6 6
7 #include "ash/frame/caption_buttons/frame_caption_button_container_view.h" 7 #include "ash/frame/caption_buttons/frame_caption_button_container_view.h"
8 #include "ash/frame/default_header_painter.h" 8 #include "ash/frame/default_header_painter.h"
9 #include "ash/frame/frame_border_hit_test_controller.h" 9 #include "ash/frame/frame_border_hit_test_controller.h"
10 #include "ui/base/hit_test.h" 10 #include "ui/base/hit_test.h"
(...skipping 21 matching lines...) Expand all
32 PanelFrameView::~PanelFrameView() { 32 PanelFrameView::~PanelFrameView() {
33 } 33 }
34 34
35 const char* PanelFrameView::GetClassName() const { 35 const char* PanelFrameView::GetClassName() const {
36 return kViewClassName; 36 return kViewClassName;
37 } 37 }
38 38
39 void PanelFrameView::InitHeaderPainter() { 39 void PanelFrameView::InitHeaderPainter() {
40 header_painter_.reset(new DefaultHeaderPainter); 40 header_painter_.reset(new DefaultHeaderPainter);
41 41
42 caption_button_container_ = new FrameCaptionButtonContainerView(frame_, 42 caption_button_container_ = new FrameCaptionButtonContainerView(frame_);
43 FrameCaptionButtonContainerView::MINIMIZE_ALLOWED);
44 AddChildView(caption_button_container_); 43 AddChildView(caption_button_container_);
45 44
46 header_painter_->Init(frame_, this, caption_button_container_); 45 header_painter_->Init(frame_, this, caption_button_container_);
47 46
48 if (frame_->widget_delegate()->ShouldShowWindowIcon()) { 47 if (frame_->widget_delegate()->ShouldShowWindowIcon()) {
49 window_icon_ = new views::ImageView(); 48 window_icon_ = new views::ImageView();
50 AddChildView(window_icon_); 49 AddChildView(window_icon_);
51 header_painter_->UpdateLeftHeaderView(window_icon_); 50 header_painter_->UpdateLeftHeaderView(window_icon_);
52 } 51 }
53 } 52 }
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 } 124 }
126 125
127 gfx::Rect PanelFrameView::GetWindowBoundsForClientBounds( 126 gfx::Rect PanelFrameView::GetWindowBoundsForClientBounds(
128 const gfx::Rect& client_bounds) const { 127 const gfx::Rect& client_bounds) const {
129 gfx::Rect window_bounds = client_bounds; 128 gfx::Rect window_bounds = client_bounds;
130 window_bounds.Inset(0, -NonClientTopBorderHeight(), 0, 0); 129 window_bounds.Inset(0, -NonClientTopBorderHeight(), 0, 0);
131 return window_bounds; 130 return window_bounds;
132 } 131 }
133 132
134 } // namespace ash 133 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698