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

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

Issue 2046513003: mash: Move shelf model and item classes to ash/common/shelf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@initshelfearly
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
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/shelf/shelf_item_delegate.h"
11 #include "ash/common/shelf/shelf_item_delegate_manager.h"
12 #include "ash/common/shelf/shelf_model.h"
10 #include "ash/common/shelf/wm_shelf_util.h" 13 #include "ash/common/shelf/wm_shelf_util.h"
11 #include "ash/common/shell_window_ids.h" 14 #include "ash/common/shell_window_ids.h"
12 #include "ash/focus_cycler.h" 15 #include "ash/focus_cycler.h"
13 #include "ash/root_window_controller.h" 16 #include "ash/root_window_controller.h"
14 #include "ash/root_window_settings.h" 17 #include "ash/root_window_settings.h"
15 #include "ash/screen_util.h" 18 #include "ash/screen_util.h"
16 #include "ash/shelf/shelf_delegate.h" 19 #include "ash/shelf/shelf_delegate.h"
17 #include "ash/shelf/shelf_item_delegate.h"
18 #include "ash/shelf/shelf_item_delegate_manager.h"
19 #include "ash/shelf/shelf_layout_manager.h" 20 #include "ash/shelf/shelf_layout_manager.h"
20 #include "ash/shelf/shelf_model.h"
21 #include "ash/shelf/shelf_navigator.h" 21 #include "ash/shelf/shelf_navigator.h"
22 #include "ash/shelf/shelf_util.h" 22 #include "ash/shelf/shelf_util.h"
23 #include "ash/shell.h" 23 #include "ash/shell.h"
24 #include "ash/shell_delegate.h" 24 #include "ash/shell_delegate.h"
25 #include "ash/wm/window_properties.h" 25 #include "ash/wm/window_properties.h"
26 #include "ui/aura/window.h" 26 #include "ui/aura/window.h"
27 #include "ui/aura/window_event_dispatcher.h" 27 #include "ui/aura/window_event_dispatcher.h"
28 #include "ui/aura/window_observer.h" 28 #include "ui/aura/window_observer.h"
29 #include "ui/compositor/layer.h" 29 #include "ui/compositor/layer.h"
30 #include "ui/gfx/canvas.h" 30 #include "ui/gfx/canvas.h"
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 221
222 gfx::Rect Shelf::GetVisibleItemsBoundsInScreen() const { 222 gfx::Rect Shelf::GetVisibleItemsBoundsInScreen() const {
223 return shelf_view_->GetVisibleItemsBoundsInScreen(); 223 return shelf_view_->GetVisibleItemsBoundsInScreen();
224 } 224 }
225 225
226 app_list::ApplicationDragAndDropHost* Shelf::GetDragAndDropHostForAppList() { 226 app_list::ApplicationDragAndDropHost* Shelf::GetDragAndDropHostForAppList() {
227 return shelf_view_; 227 return shelf_view_;
228 } 228 }
229 229
230 } // namespace ash 230 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shelf/app_list_shelf_item_delegate.cc ('k') | ash/shelf/shelf_button_pressed_metric_tracker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698