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

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

Issue 2401473002: [ash-md] Erases the pre-MD code path for Overview Mode (Closed)
Patch Set: [ash-md] Erases the pre-MD code path for Overview Mode (comments) Created 4 years, 2 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
« no previous file with comments | « ash/wm/overview/window_selector_unittest.cc ('k') | chrome/app/generated_resources.grd » ('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) 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/common/frame/caption_buttons/frame_caption_button_container_view.h " 7 #include "ash/common/frame/caption_buttons/frame_caption_button_container_view.h "
8 #include "ash/common/frame/default_header_painter.h" 8 #include "ash/common/frame/default_header_painter.h"
9 #include "ash/common/frame/frame_border_hit_test.h" 9 #include "ash/common/frame/frame_border_hit_test.h"
10 #include "ash/common/material_design/material_design_controller.h"
11 #include "ash/common/wm_lookup.h" 10 #include "ash/common/wm_lookup.h"
12 #include "ash/common/wm_shell.h" 11 #include "ash/common/wm_shell.h"
13 #include "ash/common/wm_window.h" 12 #include "ash/common/wm_window.h"
14 #include "ui/aura/client/aura_constants.h" 13 #include "ui/aura/client/aura_constants.h"
15 #include "ui/aura/window.h" 14 #include "ui/aura/window.h"
16 #include "ui/base/hit_test.h" 15 #include "ui/base/hit_test.h"
17 #include "ui/gfx/canvas.h" 16 #include "ui/gfx/canvas.h"
18 #include "ui/views/controls/image_view.h" 17 #include "ui/views/controls/image_view.h"
19 #include "ui/views/widget/widget.h" 18 #include "ui/views/widget/widget.h"
20 #include "ui/views/widget/widget_delegate.h" 19 #include "ui/views/widget/widget_delegate.h"
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 HeaderPainter::Mode header_mode = paint_as_active 141 HeaderPainter::Mode header_mode = paint_as_active
143 ? HeaderPainter::MODE_ACTIVE 142 ? HeaderPainter::MODE_ACTIVE
144 : HeaderPainter::MODE_INACTIVE; 143 : HeaderPainter::MODE_INACTIVE;
145 header_painter_->PaintHeader(canvas, header_mode); 144 header_painter_->PaintHeader(canvas, header_mode);
146 } 145 }
147 146
148 /////////////////////////////////////////////////////////////////////////////// 147 ///////////////////////////////////////////////////////////////////////////////
149 // PanelFrameView, ShellObserver overrides: 148 // PanelFrameView, ShellObserver overrides:
150 149
151 void PanelFrameView::OnOverviewModeStarting() { 150 void PanelFrameView::OnOverviewModeStarting() {
152 if (ash::MaterialDesignController::IsOverviewMaterial()) 151 caption_button_container_->SetVisible(false);
153 caption_button_container_->SetVisible(false);
154 } 152 }
155 153
156 void PanelFrameView::OnOverviewModeEnded() { 154 void PanelFrameView::OnOverviewModeEnded() {
157 if (ash::MaterialDesignController::IsOverviewMaterial()) 155 caption_button_container_->SetVisible(true);
158 caption_button_container_->SetVisible(true);
159 } 156 }
160 157
161 } // namespace ash 158 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/overview/window_selector_unittest.cc ('k') | chrome/app/generated_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698