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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/aura/wm_root_window_controller_aura.cc

Issue 2293183002: ash: Remove ash::Shelf in favor of ash::WmShelf (Closed)
Patch Set: 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/ash.gyp ('k') | ash/common/accelerators/accelerator_controller.cc » ('j') | ash/common/shelf/wm_shelf.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/aura/wm_root_window_controller_aura.cc
diff --git a/ash/aura/wm_root_window_controller_aura.cc b/ash/aura/wm_root_window_controller_aura.cc
index cadc1327d23288ed2af9d6b610882d8a13cd289b..04bd7f4c3dfcedce6bc262f05c56f45087ac1594 100644
--- a/ash/aura/wm_root_window_controller_aura.cc
+++ b/ash/aura/wm_root_window_controller_aura.cc
@@ -7,7 +7,6 @@
#include "ash/aura/wm_shelf_aura.h"
#include "ash/aura/wm_shell_aura.h"
#include "ash/aura/wm_window_aura.h"
-#include "ash/common/shelf/shelf.h"
#include "ash/common/shelf/shelf_widget.h"
#include "ash/common/wm/workspace/workspace_layout_manager_backdrop_delegate.h"
#include "ash/common/wm/workspace_controller.h"
@@ -160,4 +159,4 @@ void WmRootWindowControllerAura::OnDisplayMetricsChanged(
OnWorkAreaChanged());
}
-} // namespace ash
+} // namespace ash
« no previous file with comments | « ash/ash.gyp ('k') | ash/common/accelerators/accelerator_controller.cc » ('j') | ash/common/shelf/wm_shelf.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698