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

Unified Diff: components/arc/window_manager/arc_window_manager_bridge.cc

Issue 2113053003: Moves Shell::maximize_mode_controller() to WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: order Created 4 years, 6 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 | « chrome/browser/ui/webui/chromeos/touch_view_controller_delegate.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/arc/window_manager/arc_window_manager_bridge.cc
diff --git a/components/arc/window_manager/arc_window_manager_bridge.cc b/components/arc/window_manager/arc_window_manager_bridge.cc
index cdc57db5bc26af1f9465cf7f496e9424be2458a1..45b96861250e25f61ddd674d000ad9736475e894 100644
--- a/components/arc/window_manager/arc_window_manager_bridge.cc
+++ b/components/arc/window_manager/arc_window_manager_bridge.cc
@@ -6,7 +6,6 @@
#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
#include "ash/common/wm_shell.h"
-#include "ash/shell.h"
#include "base/logging.h"
#include "components/arc/arc_bridge_service.h"
@@ -26,13 +25,13 @@ ArcWindowManagerBridge::ArcWindowManagerBridge(ArcBridgeService* bridge_service)
}
void ArcWindowManagerBridge::OnWindowManagerInstanceReady() {
- if (!ash::Shell::HasInstance()) {
+ if (!ash::WmShell::HasInstance()) {
// The shell gets always loaded before ARC. If there is no shell it can only
// mean that a unit test is running.
return;
}
ash::MaximizeModeController* controller =
- ash::Shell::GetInstance()->maximize_mode_controller();
+ ash::WmShell::Get()->maximize_mode_controller();
if (!controller)
return;
« no previous file with comments | « chrome/browser/ui/webui/chromeos/touch_view_controller_delegate.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698