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

Unified Diff: ash/mus/non_client_frame_controller.cc

Issue 2410633002: Moves PanelFrameView to common (Closed)
Patch Set: 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/common/wm/panels/panel_frame_view.cc ('k') | ash/mus/root_window_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/non_client_frame_controller.cc
diff --git a/ash/mus/non_client_frame_controller.cc b/ash/mus/non_client_frame_controller.cc
index b0a804582f939b90d8603faa7624d6967446815b..b3bc8527b4cb9342debf23bce8e95ba1473e2e93 100644
--- a/ash/mus/non_client_frame_controller.cc
+++ b/ash/mus/non_client_frame_controller.cc
@@ -13,6 +13,7 @@
#include "ash/common/ash_constants.h"
#include "ash/common/ash_layout_constants.h"
#include "ash/common/frame/custom_frame_view_ash.h"
+#include "ash/common/wm/panels/panel_frame_view.h"
#include "ash/mus/bridge/wm_window_mus.h"
#include "ash/mus/frame/custom_frame_view_mus.h"
#include "ash/mus/frame/detached_title_area_renderer.h"
@@ -231,6 +232,8 @@ class WmNativeWidgetMus : public views::NativeWidgetMus {
window(), window_manager_client_, GetNativeView()));
if (ShouldRemoveStandardFrame(window()))
return new EmptyDraggableNonClientFrameView();
+ if (GetWindowType(window()) == ui::mojom::WindowType::PANEL)
+ return new PanelFrameView(GetWidget(), PanelFrameView::FRAME_ASH);
immersive_delegate_.reset(
new ImmersiveFullscreenControllerDelegateMus(GetWidget(), window()));
const bool enable_immersive =
« no previous file with comments | « ash/common/wm/panels/panel_frame_view.cc ('k') | ash/mus/root_window_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698