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

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

index 1a194f24232a1c366af0c139a1a2cad2ab5b35d8..95e8ced889a2b6f7bc1c9cebe1c5d8998f008720 100644

--- a/ash/shelf/shelf_view.cc

+++ b/ash/shelf/shelf_view.cc

@@ -7,9 +7,12 @@

#include <algorithm>

#include <memory>

-#include "ash/ash_constants.h"

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

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

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

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

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

#include "ash/drag_drop/drag_image_view.h"

-#include "ash/scoped_root_window_for_new_windows.h"

#include "ash/shelf/app_list_button.h"

#include "ash/shelf/overflow_bubble.h"

#include "ash/shelf/overflow_bubble_view.h"

@@ -21,11 +24,8 @@

#include "ash/shelf/shelf_model.h"

#include "ash/shelf/shelf_widget.h"

#include "ash/shelf/wm_shelf.h"

-#include "ash/shell_delegate.h"

#include "ash/strings/grit/ash_strings.h"

#include "ash/wm/root_window_finder.h"

-#include "ash/wm_shell.h"

-#include "ash/wm_window.h"

#include "base/auto_reset.h"

#include "base/memory/ptr_util.h"

#include "base/metrics/histogram_macros.h"

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