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

Unified Diff: components/exo/shell_surface.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: components/exo/shell_surface.cc
diff --git a/components/exo/shell_surface.cc b/components/exo/shell_surface.cc
index 7427457d0bfde12f93dc1aa9b604650ec6233bba..7b05e9a5822b84c238163f58d4cf892b48a79cb8 100644
--- a/components/exo/shell_surface.cc
+++ b/components/exo/shell_surface.cc
@@ -11,12 +11,12 @@
#include "ash/public/cpp/window_properties.h"
#include "ash/public/interfaces/window_pin_type.mojom.h"
#include "ash/shelf/wm_shelf.h"
+#include "ash/shell_port.h"
#include "ash/wm/drag_window_resizer.h"
#include "ash/wm/window_resizer.h"
#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
#include "ash/wm/window_util.h"
-#include "ash/wm_shell.h"
#include "ash/wm_window.h"
#include "base/logging.h"
#include "base/macros.h"
@@ -154,10 +154,10 @@ class CustomWindowTargeter : public aura::WindowTargeter {
class CustomWindowResizer : public ash::WindowResizer {
public:
explicit CustomWindowResizer(ash::wm::WindowState* window_state)
- : WindowResizer(window_state), shell_(GetTarget()->GetShell()) {
- shell_->LockCursor();
+ : WindowResizer(window_state) {
+ ash::ShellPort::Get()->LockCursor();
}
- ~CustomWindowResizer() override { shell_->UnlockCursor(); }
+ ~CustomWindowResizer() override { ash::ShellPort::Get()->UnlockCursor(); }
// Overridden from ash::WindowResizer:
void Drag(const gfx::Point& location, int event_flags) override {}
@@ -165,8 +165,6 @@ class CustomWindowResizer : public ash::WindowResizer {
void RevertDrag() override {}
private:
- ash::WmShell* const shell_;
-
DISALLOW_COPY_AND_ASSIGN(CustomWindowResizer);
};

Powered by Google App Engine
This is Rietveld 408576698