| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/mus/non_client_frame_controller.h" | 5 #include "ash/mus/non_client_frame_controller.h" |
| 6 | 6 |
| 7 #include <stdint.h> | 7 #include <stdint.h> |
| 8 | 8 |
| 9 #include <memory> | 9 #include <memory> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 206 base::MakeUnique<ImmersiveFullscreenControllerDelegateMus>(GetWidget(), | 206 base::MakeUnique<ImmersiveFullscreenControllerDelegateMus>(GetWidget(), |
| 207 window); | 207 window); |
| 208 // See description for details on ownership. | 208 // See description for details on ownership. |
| 209 custom_frame_view_ = | 209 custom_frame_view_ = |
| 210 new CustomFrameViewAsh(GetWidget(), immersive_delegate_.get(), | 210 new CustomFrameViewAsh(GetWidget(), immersive_delegate_.get(), |
| 211 enable_immersive_, window_style_); | 211 enable_immersive_, window_style_); |
| 212 // Only the header actually paints any content. So the rest of the region is | 212 // Only the header actually paints any content. So the rest of the region is |
| 213 // marked as transparent content (see below in NonClientFrameController() | 213 // marked as transparent content (see below in NonClientFrameController() |
| 214 // ctor). So, it is necessary to provide a texture-layer for the header | 214 // ctor). So, it is necessary to provide a texture-layer for the header |
| 215 // view. | 215 // view. |
| 216 views::View* header_view = custom_frame_view_->header_view(); | 216 views::View* header_view = custom_frame_view_->GetHeaderView(); |
| 217 header_view->SetPaintToLayer(ui::LAYER_TEXTURED); | 217 header_view->SetPaintToLayer(ui::LAYER_TEXTURED); |
| 218 header_view->layer()->SetFillsBoundsOpaquely(false); | 218 header_view->layer()->SetFillsBoundsOpaquely(false); |
| 219 | 219 |
| 220 return custom_frame_view_; | 220 return custom_frame_view_; |
| 221 } | 221 } |
| 222 | 222 |
| 223 private: | 223 private: |
| 224 const bool remove_standard_frame_; | 224 const bool remove_standard_frame_; |
| 225 const bool enable_immersive_; | 225 const bool enable_immersive_; |
| 226 const mojom::WindowStyle window_style_; | 226 const mojom::WindowStyle window_style_; |
| (...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 467 void NonClientFrameController::OnWillRestackTransientChildAbove( | 467 void NonClientFrameController::OnWillRestackTransientChildAbove( |
| 468 aura::Window* parent, | 468 aura::Window* parent, |
| 469 aura::Window* transient_child) {} | 469 aura::Window* transient_child) {} |
| 470 | 470 |
| 471 void NonClientFrameController::OnDidRestackTransientChildAbove( | 471 void NonClientFrameController::OnDidRestackTransientChildAbove( |
| 472 aura::Window* parent, | 472 aura::Window* parent, |
| 473 aura::Window* transient_child) {} | 473 aura::Window* transient_child) {} |
| 474 | 474 |
| 475 } // namespace mus | 475 } // namespace mus |
| 476 } // namespace ash | 476 } // namespace ash |
| OLD | NEW |