ash/shelf/shelf_widget.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/shelf/shelf_widget.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/shelf/shelf_widget.cc

diff --git a/ash/shelf/shelf_widget.cc b/ash/shelf/shelf_widget.cc

index b14169cfd2ae1ed616d9de8eab4408f9f2244f0c..8568cea6a83fe301dd261f8c9aed21be4a649309 100644

--- a/ash/shelf/shelf_widget.cc

+++ b/ash/shelf/shelf_widget.cc

@@ -5,9 +5,11 @@

#include "ash/shelf/shelf_widget.h"

#include "ash/animation/animation_change_type.h"

-#include "ash/focus_cycler.h"

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

+#include "ash/common/session/session_state_delegate.h"

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

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

#include "ash/root_window_controller.h"

-#include "ash/session/session_state_delegate.h"

#include "ash/shelf/app_list_button.h"

#include "ash/shelf/shelf_background_animator_observer.h"

#include "ash/shelf/shelf_constants.h"

@@ -19,8 +21,6 @@

#include "ash/system/status_area_layout_manager.h"

#include "ash/system/status_area_widget.h"

#include "ash/wm/window_properties.h"

-#include "ash/wm_shell.h"

-#include "ash/wm_window.h"

#include "base/memory/ptr_util.h"

#include "ui/compositor/layer.h"

#include "ui/compositor/scoped_layer_animation_settings.h"

« no previous file with comments | « ash/shelf/shelf_view_unittest.cc ('k') | ash/shelf/shelf_widget_unittest.cc » ('j') | no next file with comments »