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

Side by Side Diff: ash/shelf/shelf.cc

Issue 2030593002: Renames ash/wm/common into ash/common/wm (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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
« no previous file with comments | « ash/shelf/overflow_bubble_view.cc ('k') | ash/shelf/shelf_layout_manager.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/shelf/shelf.h" 5 #include "ash/shelf/shelf.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 9
10 #include "ash/common/wm/shelf/wm_shelf_util.h"
10 #include "ash/focus_cycler.h" 11 #include "ash/focus_cycler.h"
11 #include "ash/root_window_controller.h" 12 #include "ash/root_window_controller.h"
12 #include "ash/screen_util.h" 13 #include "ash/screen_util.h"
13 #include "ash/shelf/shelf_delegate.h" 14 #include "ash/shelf/shelf_delegate.h"
14 #include "ash/shelf/shelf_item_delegate.h" 15 #include "ash/shelf/shelf_item_delegate.h"
15 #include "ash/shelf/shelf_item_delegate_manager.h" 16 #include "ash/shelf/shelf_item_delegate_manager.h"
16 #include "ash/shelf/shelf_layout_manager.h" 17 #include "ash/shelf/shelf_layout_manager.h"
17 #include "ash/shelf/shelf_model.h" 18 #include "ash/shelf/shelf_model.h"
18 #include "ash/shelf/shelf_navigator.h" 19 #include "ash/shelf/shelf_navigator.h"
19 #include "ash/shelf/shelf_util.h" 20 #include "ash/shelf/shelf_util.h"
20 #include "ash/shelf/shelf_view.h" 21 #include "ash/shelf/shelf_view.h"
21 #include "ash/shell.h" 22 #include "ash/shell.h"
22 #include "ash/shell_delegate.h" 23 #include "ash/shell_delegate.h"
23 #include "ash/shell_window_ids.h" 24 #include "ash/shell_window_ids.h"
24 #include "ash/wm/aura/wm_shelf_aura.h" 25 #include "ash/wm/aura/wm_shelf_aura.h"
25 #include "ash/wm/common/shelf/wm_shelf_util.h"
26 #include "ash/wm/window_properties.h" 26 #include "ash/wm/window_properties.h"
27 #include "ui/aura/window.h" 27 #include "ui/aura/window.h"
28 #include "ui/aura/window_event_dispatcher.h" 28 #include "ui/aura/window_event_dispatcher.h"
29 #include "ui/aura/window_observer.h" 29 #include "ui/aura/window_observer.h"
30 #include "ui/compositor/layer.h" 30 #include "ui/compositor/layer.h"
31 #include "ui/gfx/canvas.h" 31 #include "ui/gfx/canvas.h"
32 #include "ui/gfx/image/image.h" 32 #include "ui/gfx/image/image.h"
33 #include "ui/gfx/image/image_skia_operations.h" 33 #include "ui/gfx/image/image_skia_operations.h"
34 #include "ui/gfx/skbitmap_operations.h" 34 #include "ui/gfx/skbitmap_operations.h"
35 #include "ui/views/accessible_pane_view.h" 35 #include "ui/views/accessible_pane_view.h"
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 205
206 gfx::Rect Shelf::GetVisibleItemsBoundsInScreen() const { 206 gfx::Rect Shelf::GetVisibleItemsBoundsInScreen() const {
207 return shelf_view_->GetVisibleItemsBoundsInScreen(); 207 return shelf_view_->GetVisibleItemsBoundsInScreen();
208 } 208 }
209 209
210 app_list::ApplicationDragAndDropHost* Shelf::GetDragAndDropHostForAppList() { 210 app_list::ApplicationDragAndDropHost* Shelf::GetDragAndDropHostForAppList() {
211 return shelf_view_; 211 return shelf_view_;
212 } 212 }
213 213
214 } // namespace ash 214 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shelf/overflow_bubble_view.cc ('k') | ash/shelf/shelf_layout_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698