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

Side by Side Diff: chrome/browser/ui/views/ash/window_positioner.cc

Issue 10365007: ui: Move compositor/ directory out of gfx/, up to ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix DEPS Created 8 years, 7 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 "chrome/browser/ui/views/ash/window_positioner.h" 5 #include "chrome/browser/ui/views/ash/window_positioner.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/wm/window_cycle_controller.h" 8 #include "ash/wm/window_cycle_controller.h"
9 #include "ash/wm/window_resizer.h" 9 #include "ash/wm/window_resizer.h"
10 #include "ash/wm/window_util.h" 10 #include "ash/wm/window_util.h"
11 #include "ui/aura/window.h" 11 #include "ui/aura/window.h"
12 #include "ui/aura/window_delegate.h" 12 #include "ui/aura/window_delegate.h"
13 #include "ui/gfx/compositor/layer.h" 13 #include "ui/compositor/layer.h"
14 #include "ui/gfx/screen.h" 14 #include "ui/gfx/screen.h"
15 15
16 WindowPositioner::WindowPositioner() 16 WindowPositioner::WindowPositioner()
17 : pop_position_offset_increment_x(0), 17 : pop_position_offset_increment_x(0),
18 pop_position_offset_increment_y(0), 18 pop_position_offset_increment_y(0),
19 popup_position_offset_from_screen_corner_x(0), 19 popup_position_offset_from_screen_corner_x(0),
20 popup_position_offset_from_screen_corner_y(0), 20 popup_position_offset_from_screen_corner_y(0),
21 last_popup_position_x_(0), 21 last_popup_position_x_(0),
22 last_popup_position_y_(0) { 22 last_popup_position_y_(0) {
23 } 23 }
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 int h = pos.height(); 181 int h = pos.height();
182 182
183 // If the alignment was pushing the window out of the screen, we ignore the 183 // If the alignment was pushing the window out of the screen, we ignore the
184 // alignment for that call. 184 // alignment for that call.
185 if (abs(pos.right() - work_area.right()) < grid) 185 if (abs(pos.right() - work_area.right()) < grid)
186 x = work_area.right() - w; 186 x = work_area.right() - w;
187 if (abs(pos.bottom() - work_area.bottom()) < grid) 187 if (abs(pos.bottom() - work_area.bottom()) < grid)
188 y = work_area.bottom() - h; 188 y = work_area.bottom() - h;
189 return gfx::Rect(x, y, w, h); 189 return gfx::Rect(x, y, w, h);
190 } 190 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/ash/screenshot_taker.h ('k') | chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698