chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.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: chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.h ('k') | chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc

diff --git a/chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc b/chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc

index 91a78cb03b37f0318c22e3577e5004609b367152..586c3a959948737a4b195d3a93cc713a2f3f9906 100644

--- a/chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc

+++ b/chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc

@@ -5,6 +5,8 @@

#include <string>

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

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

#include "ash/display/screen_orientation_controller_chromeos.h"

#include "ash/shared/app_types.h"

#include "ash/shelf/shelf_delegate.h"

@@ -14,8 +16,6 @@

#include "ash/wm/window_state.h"

#include "ash/wm/window_state_aura.h"

#include "ash/wm/window_util.h"

-#include "ash/wm_shell.h"

-#include "ash/wm_window.h"

#include "base/bind.h"

#include "base/memory/ptr_util.h"

#include "chrome/browser/chromeos/arc/arc_support_host.h"