ash/frame/custom_frame_view_ash.cc - Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3"

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/frame/custom_frame_view_ash.cc

Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3" (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/frame/custom_frame_view_ash.cc

diff --git a/ash/frame/custom_frame_view_ash.cc b/ash/frame/custom_frame_view_ash.cc

index ab523e7d27502fcf7cd6dc2ed97ca153f649065b..a41420ff326f69807a397a7e0ad6a287c94996e0 100644

--- a/ash/frame/custom_frame_view_ash.cc

+++ b/ash/frame/custom_frame_view_ash.cc

@@ -7,6 +7,8 @@

#include <algorithm>

#include <vector>

+#include "ash/common/wm_shell.h"

+#include "ash/common/wm_window.h"

#include "ash/frame/caption_buttons/frame_caption_button_container_view.h"

#include "ash/frame/frame_border_hit_test.h"

#include "ash/frame/header_view.h"

@@ -15,8 +17,6 @@

#include "ash/wm/window_state.h"

#include "ash/wm/window_state_delegate.h"

#include "ash/wm/window_state_observer.h"

-#include "ash/wm_shell.h"

-#include "ash/wm_window.h"

#include "ui/aura/client/aura_constants.h"

#include "ui/aura/window.h"

#include "ui/aura/window_observer.h"