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

Unified Diff: ash/wm/wm_screen_util.cc

Issue 2808723004: Renames WmShell to ShellPort (Closed)
Patch Set: feedback Created 3 years, 8 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/wm/wm_screen_util.cc
diff --git a/ash/wm/wm_screen_util.cc b/ash/wm/wm_screen_util.cc
index 25cfd9fabd3c8761acf43b2c33b3c9a070fa83c4..4cce97bd1fc3111cdaecd586dc4fb088d1583081 100644
--- a/ash/wm/wm_screen_util.cc
+++ b/ash/wm/wm_screen_util.cc
@@ -5,7 +5,7 @@
#include "ash/wm/wm_screen_util.h"
#include "ash/root_window_controller.h"
-#include "ash/wm_shell.h"
+#include "ash/shell_port.h"
#include "ash/wm_window.h"
#include "ui/display/display.h"
#include "ui/display/screen.h"
@@ -32,9 +32,9 @@ gfx::Rect GetMaximizedWindowBoundsInParent(WmWindow* window) {
}
gfx::Rect GetDisplayBoundsWithShelf(WmWindow* window) {
- if (WmShell::Get()->IsInUnifiedMode()) {
+ if (ShellPort::Get()->IsInUnifiedMode()) {
// In unified desktop mode, there is only one shelf in the first display.
- gfx::SizeF size(WmShell::Get()->GetFirstDisplay().size());
+ gfx::SizeF size(ShellPort::Get()->GetFirstDisplay().size());
float scale = window->GetRootWindow()->GetBounds().height() / size.height();
size.Scale(scale, scale);
return gfx::Rect(gfx::ToCeiledSize(size));

Powered by Google App Engine
This is Rietveld 408576698