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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/common/system/chromeos/audio/tray_audio.cc

Issue 2620153003: Folds WmRootWindowController into RootWindowController (Closed)
Patch Set: cleanup Created 3 years, 11 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/common/accelerators/accelerator_controller.cc ('K') | « ash/common/shelf/wm_shelf.cc ('k') | ash/common/system/chromeos/ime_menu/ime_menu_tray.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/chromeos/audio/tray_audio.cc
diff --git a/ash/common/system/chromeos/audio/tray_audio.cc b/ash/common/system/chromeos/audio/tray_audio.cc
index a203026ed54fa43a0fe1ab24fba1c2ad99525753..7260102e9b47bb5e55fb92a00c4e9514181280d7 100644
--- a/ash/common/system/chromeos/audio/tray_audio.cc
+++ b/ash/common/system/chromeos/audio/tray_audio.cc
@@ -9,9 +9,9 @@
#include "ash/common/system/chromeos/audio/volume_view.h"
#include "ash/common/system/tray/system_tray.h"
#include "ash/common/system/tray/tray_constants.h"
-#include "ash/common/wm_root_window_controller.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
+#include "ash/root_window_controller.h"
#include "chromeos/dbus/dbus_thread_manager.h"
#include "grit/ash_resources.h"
#include "ui/display/display.h"
« ash/common/accelerators/accelerator_controller.cc ('K') | « ash/common/shelf/wm_shelf.cc ('k') | ash/common/system/chromeos/ime_menu/ime_menu_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698