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

Side by Side Diff: ash/wm/window_animations.cc

Issue 2268823002: mash: Move more shelf files to ash/common/shelf. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix rebase. Created 4 years, 4 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
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/window_animations.h" 5 #include "ash/wm/window_animations.h"
6 6
7 #include <math.h> 7 #include <math.h>
8 #include <algorithm> 8 #include <algorithm>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
11 11
12 #include "ash/aura/wm_window_aura.h" 12 #include "ash/aura/wm_window_aura.h"
13 #include "ash/common/shelf/shelf.h"
14 #include "ash/common/shelf/shelf_layout_manager.h"
15 #include "ash/common/shelf/shelf_widget.h"
13 #include "ash/common/wm/window_animation_types.h" 16 #include "ash/common/wm/window_animation_types.h"
14 #include "ash/screen_util.h" 17 #include "ash/screen_util.h"
15 #include "ash/shelf/shelf.h"
16 #include "ash/shelf/shelf_layout_manager.h"
17 #include "ash/shelf/shelf_widget.h"
18 #include "ash/wm/window_util.h" 18 #include "ash/wm/window_util.h"
19 #include "ash/wm/workspace_controller.h" 19 #include "ash/wm/workspace_controller.h"
20 #include "base/command_line.h" 20 #include "base/command_line.h"
21 #include "base/compiler_specific.h" 21 #include "base/compiler_specific.h"
22 #include "base/logging.h" 22 #include "base/logging.h"
23 #include "base/message_loop/message_loop.h" 23 #include "base/message_loop/message_loop.h"
24 #include "base/stl_util.h" 24 #include "base/stl_util.h"
25 #include "base/time/time.h" 25 #include "base/time/time.h"
26 #include "ui/aura/client/aura_constants.h" 26 #include "ui/aura/client/aura_constants.h"
27 #include "ui/aura/window.h" 27 #include "ui/aura/window.h"
(...skipping 448 matching lines...) Expand 10 before | Expand all | Expand 10 after
476 case SHELF_ALIGNMENT_LEFT: 476 case SHELF_ALIGNMENT_LEFT:
477 return gfx::Rect(work_area.x(), work_area.y(), 0, 0); 477 return gfx::Rect(work_area.x(), work_area.y(), 0, 0);
478 case SHELF_ALIGNMENT_RIGHT: 478 case SHELF_ALIGNMENT_RIGHT:
479 return gfx::Rect(work_area.right(), work_area.y(), 0, 0); 479 return gfx::Rect(work_area.right(), work_area.y(), 0, 0);
480 } 480 }
481 NOTREACHED(); 481 NOTREACHED();
482 return gfx::Rect(); 482 return gfx::Rect();
483 } 483 }
484 484
485 } // namespace ash 485 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/system_gesture_event_filter_unittest.cc ('k') | ash/wm/window_cycle_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698