Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1549)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/sysui/shelf_delegate_mus.cc

Issue 2268823002: mash: Move more shelf files to ash/common/shelf. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix rebase. Created 4 years, 4 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 | « ash/shell_unittest.cc ('k') | ash/test/shelf_test_api.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/sysui/shelf_delegate_mus.cc
diff --git a/ash/sysui/shelf_delegate_mus.cc b/ash/sysui/shelf_delegate_mus.cc
index 82a262636de3cb10489a319b1b3055eb93a344bf..c90989981f1a12c90017940e2f2fc796463af90f 100644
--- a/ash/sysui/shelf_delegate_mus.cc
+++ b/ash/sysui/shelf_delegate_mus.cc
@@ -6,15 +6,15 @@
#include <memory>
+#include "ash/common/shelf/shelf.h"
#include "ash/common/shelf/shelf_item_delegate.h"
+#include "ash/common/shelf/shelf_layout_manager.h"
#include "ash/common/shelf/shelf_menu_model.h"
#include "ash/common/shelf/shelf_model.h"
#include "ash/common/shelf/shelf_types.h"
+#include "ash/common/shelf/shelf_widget.h"
#include "ash/common/system/status_area_widget.h"
#include "ash/common/wm_shell.h"
-#include "ash/shelf/shelf.h"
-#include "ash/shelf/shelf_layout_manager.h"
-#include "ash/shelf/shelf_widget.h"
#include "base/strings/string_util.h"
#include "mojo/common/common_type_converters.h"
#include "services/shell/public/cpp/connector.h"
« no previous file with comments | « ash/shell_unittest.cc ('k') | ash/test/shelf_test_api.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698