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

Side by Side Diff: ash/wm/workspace/multi_window_resize_controller.cc

Issue 10910164: Removes the grid from ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix ShelfBrowserTest Created 8 years, 3 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/wm/workspace/multi_window_resize_controller.h" 5 #include "ash/wm/workspace/multi_window_resize_controller.h"
6 6
7 #include "ash/screen_ash.h" 7 #include "ash/screen_ash.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "ash/shell_window_ids.h" 9 #include "ash/shell_window_ids.h"
10 #include "ash/wm/window_animations.h" 10 #include "ash/wm/window_animations.h"
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 } 141 }
142 142
143 bool MultiWindowResizeController::ResizeWindows::Equals( 143 bool MultiWindowResizeController::ResizeWindows::Equals(
144 const ResizeWindows& other) const { 144 const ResizeWindows& other) const {
145 return window1 == other.window1 && 145 return window1 == other.window1 &&
146 window2 == other.window2 && 146 window2 == other.window2 &&
147 direction == other.direction; 147 direction == other.direction;
148 } 148 }
149 149
150 MultiWindowResizeController::MultiWindowResizeController() 150 MultiWindowResizeController::MultiWindowResizeController()
151 : resize_widget_(NULL), 151 : resize_widget_(NULL){
152 grid_size_(0) {
153 } 152 }
154 153
155 MultiWindowResizeController::~MultiWindowResizeController() { 154 MultiWindowResizeController::~MultiWindowResizeController() {
156 Hide(); 155 Hide();
157 } 156 }
158 157
159 void MultiWindowResizeController::Show(Window* window, 158 void MultiWindowResizeController::Show(Window* window,
160 int component, 159 int component,
161 const gfx::Point& point_in_window) { 160 const gfx::Point& point_in_window) {
162 // When the resize widget is showing we ignore Show() requests. Instead we 161 // When the resize widget is showing we ignore Show() requests. Instead we
(...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after
506 505
507 gfx::Point window_loc(location_in_screen); 506 gfx::Point window_loc(location_in_screen);
508 aura::Window::ConvertPointToTarget( 507 aura::Window::ConvertPointToTarget(
509 window->GetRootWindow(), window, &window_loc); 508 window->GetRootWindow(), window, &window_loc);
510 return window->HitTest(window_loc) && 509 return window->HitTest(window_loc) &&
511 window->delegate()->GetNonClientComponent(window_loc) == component; 510 window->delegate()->GetNonClientComponent(window_loc) == component;
512 } 511 }
513 512
514 } // namespace internal 513 } // namespace internal
515 } // namespace ash 514 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/workspace/multi_window_resize_controller.h ('k') | ash/wm/workspace/multi_window_resize_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698