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

Unified Diff: components/exo/wayland/server.cc

Issue 2230803002: Fix build breakage due to unmerged refactoring (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2785
Patch Set: 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/exo/wayland/server.cc
diff --git a/components/exo/wayland/server.cc b/components/exo/wayland/server.cc
index cbb1650783f76ff58bfb28f51306c003981ff3fe..b4c2c99239e017c4b57aa15015fe53da67cba955 100644
--- a/components/exo/wayland/server.cc
+++ b/components/exo/wayland/server.cc
@@ -30,10 +30,10 @@
#include "ash/common/display/display_info.h"
#include "ash/common/shell_observer.h"
#include "ash/common/shell_window_ids.h"
-#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
#include "ash/common/wm_shell.h"
#include "ash/display/display_manager.h"
#include "ash/shell.h"
+#include "ash/wm/maximize_mode/maximize_mode_controller.h"
#include "base/bind.h"
#include "base/cancelable_callback.h"
#include "base/files/file_path.h"
@@ -1588,7 +1588,7 @@ class WaylandRemoteShell : public ash::ShellObserver,
shell->activation_client()->AddObserver(this);
display::Screen::GetScreen()->AddObserver(this);
- layout_mode_ = ash::WmShell::Get()
+ layout_mode_ = ash::Shell::GetInstance()
->maximize_mode_controller()
->IsMaximizeModeWindowManagerEnabled()
? ZWP_REMOTE_SHELL_V1_LAYOUT_MODE_TABLET
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698