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

Unified Diff: ash/common/frame/caption_buttons/frame_size_button.cc

Issue 2726823003: Remove WmLookup. (Closed)
Patch Set: Clean up include and modify comment. Created 3 years, 10 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 | « ash/common/drag_drop/drag_image_view.cc ('k') | ash/common/frame/custom_frame_view_ash.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/frame/caption_buttons/frame_size_button.cc
diff --git a/ash/common/frame/caption_buttons/frame_size_button.cc b/ash/common/frame/caption_buttons/frame_size_button.cc
index e28380958000abe098a322d6319908b2308d8f85..cc2fe20e4d08d9c34414220170841325a308efa9 100644
--- a/ash/common/frame/caption_buttons/frame_size_button.cc
+++ b/ash/common/frame/caption_buttons/frame_size_button.cc
@@ -8,7 +8,6 @@
#include "ash/common/wm/window_state.h"
#include "ash/common/wm/wm_event.h"
#include "ash/common/wm/workspace/phantom_window_controller.h"
-#include "ash/common/wm_lookup.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "base/i18n/rtl.h"
@@ -211,7 +210,7 @@ void FrameSizeButton::UpdateSnapType(const ui::LocatedEvent& event) {
}
if (snap_type_ == SNAP_LEFT || snap_type_ == SNAP_RIGHT) {
- WmWindow* window = WmLookup::Get()->GetWindowForWidget(frame_);
+ WmWindow* window = WmWindow::Get(frame_->GetNativeWindow());
if (!phantom_window_controller_.get())
phantom_window_controller_.reset(new PhantomWindowController(window));
gfx::Rect phantom_bounds_in_parent =
@@ -243,7 +242,7 @@ bool FrameSizeButton::CommitSnap(const ui::LocatedEvent& event) {
UpdateSnapType(event);
if (in_snap_mode_ && (snap_type_ == SNAP_LEFT || snap_type_ == SNAP_RIGHT)) {
- WmWindow* window = WmLookup::Get()->GetWindowForWidget(frame_);
+ WmWindow* window = WmWindow::Get(frame_->GetNativeWindow());
wm::WindowState* window_state = window->GetWindowState();
const wm::WMEvent snap_event(snap_type_ == SNAP_LEFT
? wm::WM_EVENT_SNAP_LEFT
« no previous file with comments | « ash/common/drag_drop/drag_image_view.cc ('k') | ash/common/frame/custom_frame_view_ash.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698