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

Unified Diff: ash/system/cast/tray_cast.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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/system/cast/tray_cast.h ('k') | ash/system/date/date_default_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/cast/tray_cast.cc
diff --git a/ash/system/cast/tray_cast.cc b/ash/system/cast/tray_cast.cc
index a016dcb0b4660ec32f539ca3aa7e8a42c16ab2fe..9765818a3dbf1e5941d003200e258f16e208655a 100644
--- a/ash/system/cast/tray_cast.cc
+++ b/ash/system/cast/tray_cast.cc
@@ -9,13 +9,14 @@
#include <utility>
#include <vector>
-#include "ash/cast_config_controller.h"
-#include "ash/material_design/material_design_controller.h"
+#include "ash/common/cast_config_controller.h"
+#include "ash/common/material_design/material_design_controller.h"
+#include "ash/common/session/session_state_delegate.h"
+#include "ash/common/wm_shell.h"
#include "ash/public/cpp/shelf_types.h"
#include "ash/public/interfaces/cast_config.mojom.h"
#include "ash/resources/grit/ash_resources.h"
#include "ash/resources/vector_icons/vector_icons.h"
-#include "ash/session/session_state_delegate.h"
#include "ash/shelf/wm_shelf_util.h"
#include "ash/strings/grit/ash_strings.h"
#include "ash/system/screen_security/screen_tray_item.h"
@@ -29,7 +30,6 @@
#include "ash/system/tray/tray_item_more.h"
#include "ash/system/tray/tray_item_view.h"
#include "ash/system/tray/tray_utils.h"
-#include "ash/wm_shell.h"
#include "base/bind.h"
#include "base/strings/utf_string_conversions.h"
#include "ui/base/l10n/l10n_util.h"
« no previous file with comments | « ash/system/cast/tray_cast.h ('k') | ash/system/date/date_default_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698