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

Unified Diff: ash/shell.cc

Issue 2917013002: mash: Move ShelfModel* to ash/public/cpp. (Closed)
Patch Set: Initialize the AppList item title in ShelfController. Created 3 years, 7 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
Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index c5cd6e2b49e7a669f1cac4189e6ec097319177b4..c27352d1c3ec985b258cbb13805afba03eabac9c 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -51,12 +51,12 @@
#include "ash/new_window_controller.h"
#include "ash/palette_delegate.h"
#include "ash/public/cpp/config.h"
+#include "ash/public/cpp/shelf_model.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/root_window_controller.h"
#include "ash/session/session_controller.h"
#include "ash/shelf/shelf.h"
#include "ash/shelf/shelf_controller.h"
-#include "ash/shelf/shelf_model.h"
#include "ash/shelf/shelf_window_watcher.h"
#include "ash/shell_delegate.h"
#include "ash/shell_init_params.h"

Powered by Google App Engine
This is Rietveld 408576698