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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/shelf/shelf.cc

Issue 2177663002: mash: Move ownership of ShelfDelegate to WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix WallpaperManagerBrowserTest Created 4 years, 5 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
« ash/metrics/user_metrics_recorder.cc ('K') | « ash/metrics/user_metrics_recorder.cc ('k') | ash/shelf/shelf_delegate.h » ('j') | ash/shell.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf.cc
diff --git a/ash/shelf/shelf.cc b/ash/shelf/shelf.cc
index 2030432fc898a63173f80d4ab1bf874988448582..135a66a69841f8c074e28bc449dd7db47547b1aa 100644
--- a/ash/shelf/shelf.cc
+++ b/ash/shelf/shelf.cc
@@ -8,6 +8,7 @@
#include <cmath>
#include "ash/aura/wm_window_aura.h"
+#include "ash/common/shelf/shelf_delegate.h"
#include "ash/common/shelf/shelf_item_delegate.h"
#include "ash/common/shelf/shelf_model.h"
#include "ash/common/shelf/shelf_navigator.h"
@@ -15,7 +16,6 @@
#include "ash/common/shell_window_ids.h"
#include "ash/root_window_controller.h"
#include "ash/screen_util.h"
-#include "ash/shelf/shelf_delegate.h"
#include "ash/shelf/shelf_layout_manager.h"
#include "ash/shelf/shelf_util.h"
#include "ash/shelf/shelf_view.h"
« ash/metrics/user_metrics_recorder.cc ('K') | « ash/metrics/user_metrics_recorder.cc ('k') | ash/shelf/shelf_delegate.h » ('j') | ash/shell.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698