ash/mus/non_client_frame_controller.cc - Issue 2734753002: Revert "chromeos: Move files in //ash/common to //ash, part 2"

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/mus/non_client_frame_controller.cc

Issue 2734753002: Revert "chromeos: Move files in //ash/common to //ash, part 2" (Closed)

Patch Set: Created 3 years, 9 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:

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 064420907694a3fc75e9b8256a2b8e9ac34d77b8..12b1639fac2dbc2779e8ceb5e1a05eeada3088ce 100644

--- a/ash/mus/non_client_frame_controller.cc

+++ b/ash/mus/non_client_frame_controller.cc

@@ -12,8 +12,9 @@

#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/common/wm_window.h"

-#include "ash/frame/custom_frame_view_ash.h"

#include "ash/mus/frame/custom_frame_view_mus.h"

#include "ash/mus/frame/detached_title_area_renderer.h"

#include "ash/mus/move_event_handler.h"

@@ -21,7 +22,6 @@

#include "ash/mus/window_manager.h"

#include "ash/mus/window_properties.h"

#include "ash/shared/immersive_fullscreen_controller_delegate.h"

-#include "ash/wm/panels/panel_frame_view.h"

#include "ash/wm/window_properties.h"

#include "base/macros.h"

#include "base/memory/ptr_util.h"

« no previous file with comments | « ash/mus/move_event_handler.h ('k') | ash/mus/screen_mus.cc » ('j') | no next file with comments »