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

Side by Side Diff: ash/shelf/shelf_view.h

Issue 598013003: Added views::ViewModelT<T>, a type-safe template version of ViewModel. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@appsgridview-static-casts
Patch Set: Fix browser_test compile on ChromeOS (missing include). Created 6 years, 2 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 | « no previous file | chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc » ('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 (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 #ifndef ASH_SHELF_SHELF_VIEW_H_ 5 #ifndef ASH_SHELF_SHELF_VIEW_H_
6 #define ASH_SHELF_SHELF_VIEW_H_ 6 #define ASH_SHELF_SHELF_VIEW_H_
7 7
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
11 #include "ash/shelf/shelf_button_host.h" 11 #include "ash/shelf/shelf_button_host.h"
12 #include "ash/shelf/shelf_model_observer.h" 12 #include "ash/shelf/shelf_model_observer.h"
13 #include "ash/wm/gestures/shelf_gesture_handler.h" 13 #include "ash/wm/gestures/shelf_gesture_handler.h"
14 #include "base/observer_list.h" 14 #include "base/observer_list.h"
15 #include "ui/app_list/views/app_list_drag_and_drop_host.h" 15 #include "ui/app_list/views/app_list_drag_and_drop_host.h"
16 #include "ui/views/animation/bounds_animator_observer.h" 16 #include "ui/views/animation/bounds_animator_observer.h"
17 #include "ui/views/context_menu_controller.h" 17 #include "ui/views/context_menu_controller.h"
18 #include "ui/views/controls/button/button.h" 18 #include "ui/views/controls/button/button.h"
19 #include "ui/views/focus/focus_manager.h" 19 #include "ui/views/focus/focus_manager.h"
20 #include "ui/views/view.h" 20 #include "ui/views/view.h"
21 #include "ui/views/view_model.h"
21 22
22 namespace ui { 23 namespace ui {
23 class MenuModel; 24 class MenuModel;
24 } 25 }
25 26
26 namespace views { 27 namespace views {
27 class BoundsAnimator; 28 class BoundsAnimator;
28 class MenuRunner; 29 class MenuRunner;
29 class ViewModel;
30 } 30 }
31 31
32 namespace ash { 32 namespace ash {
33 class ShelfDelegate; 33 class ShelfDelegate;
34 class ShelfIconObserver; 34 class ShelfIconObserver;
35 class ShelfItemDelegateManager; 35 class ShelfItemDelegateManager;
36 class ShelfModel; 36 class ShelfModel;
37 struct ShelfItem; 37 struct ShelfItem;
38 class DragImageView; 38 class DragImageView;
39 class OverflowBubble; 39 class OverflowBubble;
(...skipping 399 matching lines...) Expand 10 before | Expand all | Expand 10 after
439 439
440 // True when ripped item from overflow bubble is entered into Shelf. 440 // True when ripped item from overflow bubble is entered into Shelf.
441 bool dragged_off_from_overflow_to_shelf_; 441 bool dragged_off_from_overflow_to_shelf_;
442 442
443 DISALLOW_COPY_AND_ASSIGN(ShelfView); 443 DISALLOW_COPY_AND_ASSIGN(ShelfView);
444 }; 444 };
445 445
446 } // namespace ash 446 } // namespace ash
447 447
448 #endif // ASH_SHELF_SHELF_VIEW_H_ 448 #endif // ASH_SHELF_SHELF_VIEW_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698