Index: ash/wm/overview/window_grid.cc |
diff --git a/ash/wm/overview/window_grid.cc b/ash/wm/overview/window_grid.cc |
index 7094f969106685a1aedecf01deecde38a996d927..ecbe3c97e54681a410bed83367ddb0d3201a00f8 100644 |
--- a/ash/wm/overview/window_grid.cc |
+++ b/ash/wm/overview/window_grid.cc |
@@ -15,7 +15,7 @@ |
#include "ash/public/cpp/shell_window_ids.h" |
#include "ash/root_window_controller.h" |
#include "ash/screen_util.h" |
-#include "ash/shelf/wm_shelf.h" |
+#include "ash/shelf/shelf.h" |
#include "ash/wm/overview/cleanup_animation_observer.h" |
#include "ash/wm/overview/scoped_overview_animation_settings.h" |
#include "ash/wm/overview/scoped_overview_animation_settings_factory.h" |
@@ -641,7 +641,7 @@ void WindowGrid::InitShieldWidget() { |
// synonymous with a black shelf background. Update this code if that |
// assumption is no longer valid. |
const float initial_opacity = |
- (WmShelf::ForWindow(root_window_->aura_window())->GetBackgroundType() == |
+ (Shelf::ForWindow(root_window_->aura_window())->GetBackgroundType() == |
SHELF_BACKGROUND_MAXIMIZED) |
? 1.f |
: 0.f; |