| Index: ash/wm/overview/window_grid.cc
|
| diff --git a/ash/wm/overview/window_grid.cc b/ash/wm/overview/window_grid.cc
|
| index f415ffb026b6a6ce68c945f066f6523a87f1d87e..860ff268e000847c2cca74d46145c13b01d8d32d 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_)->GetBackgroundType() ==
|
| + (Shelf::ForWindow(root_window_)->GetBackgroundType() ==
|
| SHELF_BACKGROUND_MAXIMIZED)
|
| ? 1.f
|
| : 0.f;
|
|
|