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

Unified Diff: ash/screen_util.cc

Issue 2899253002: chromeos: Rename ash::WmShelf to Shelf (Closed)
Patch Set: cleanup Created 3 years, 7 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
Index: ash/screen_util.cc
diff --git a/ash/screen_util.cc b/ash/screen_util.cc
index af12586f0cde5ab920239c1b53a005d08064c3cd..1b674ebd37eadb88e2c691a80f3564cc8a206949 100644
--- a/ash/screen_util.cc
+++ b/ash/screen_util.cc
@@ -5,7 +5,7 @@
#include "ash/screen_util.h"
#include "ash/root_window_controller.h"
-#include "ash/shelf/wm_shelf.h"
+#include "ash/shelf/shelf.h"
#include "ash/shell.h"
#include "ash/shell_port.h"
#include "base/logging.h"
@@ -22,7 +22,7 @@ namespace ash {
// static
gfx::Rect ScreenUtil::GetMaximizedWindowBoundsInParent(aura::Window* window) {
aura::Window* root_window = window->GetRootWindow();
- if (GetRootWindowController(root_window)->wm_shelf()->shelf_widget())
+ if (GetRootWindowController(root_window)->shelf()->shelf_widget())
return GetDisplayWorkAreaBoundsInParent(window);
return GetDisplayBoundsInParent(window);
}

Powered by Google App Engine
This is Rietveld 408576698