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

Unified Diff: ash/wm/workspace/workspace_window_resizer.cc

Issue 9565004: Revert 124385 - Allows tab dragging when maximized on aura. To fix it I made it so (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 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/wm/workspace/workspace_window_resizer.h ('k') | chrome/browser/ui/views/tabs/tab_drag_controller2.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/workspace/workspace_window_resizer.cc
===================================================================
--- ash/wm/workspace/workspace_window_resizer.cc (revision 124386)
+++ ash/wm/workspace/workspace_window_resizer.cc (working copy)
@@ -4,7 +4,6 @@
#include "ash/wm/workspace/workspace_window_resizer.h"
-#include "ash/wm/window_util.h"
#include "ui/aura/window.h"
#include "ui/aura/window_delegate.h"
#include "ui/aura/window_property.h"
@@ -31,10 +30,8 @@
const gfx::Point& location,
int window_component,
int grid_size)
- : WindowResizer(window, location, window_component, grid_size),
- constrain_size_(wm::IsWindowNormal(window)) {
+ : WindowResizer(window, location, window_component, grid_size) {
if (is_resizable() && GetHeightBeforeObscured(window) &&
- constrain_size_ &&
(!WindowTouchesBottomOfScreen() ||
bounds_change() != kBoundsChange_Repositions)) {
ClearHeightBeforeObscured(window);
@@ -87,9 +84,6 @@
}
void WorkspaceWindowResizer::AdjustBounds(gfx::Rect* bounds) const {
- if (!constrain_size_)
- return;
-
gfx::Rect work_area(gfx::Screen::GetMonitorWorkAreaNearestWindow(window()));
if (bounds->bottom() < work_area.bottom()) {
int height = GetHeightBeforeObscured(window());
« no previous file with comments | « ash/wm/workspace/workspace_window_resizer.h ('k') | chrome/browser/ui/views/tabs/tab_drag_controller2.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698