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

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

Issue 2917013002: mash: Move ShelfModel* to ash/public/cpp. (Closed)
Patch Set: Comment on AppList item init. Created 3 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/shelf_unittest.cc ('k') | ash/shelf/shelf_view.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 <memory> 8 #include <memory>
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
11 #include <vector> 11 #include <vector>
12 12
13 #include "ash/public/cpp/shelf_model_observer.h"
13 #include "ash/public/interfaces/shelf.mojom.h" 14 #include "ash/public/interfaces/shelf.mojom.h"
14 #include "ash/shelf/ink_drop_button_listener.h" 15 #include "ash/shelf/ink_drop_button_listener.h"
15 #include "ash/shelf/shelf_button_pressed_metric_tracker.h" 16 #include "ash/shelf/shelf_button_pressed_metric_tracker.h"
16 #include "ash/shelf/shelf_model_observer.h"
17 #include "ash/shelf/shelf_tooltip_manager.h" 17 #include "ash/shelf/shelf_tooltip_manager.h"
18 #include "base/macros.h" 18 #include "base/macros.h"
19 #include "base/memory/weak_ptr.h" 19 #include "base/memory/weak_ptr.h"
20 #include "third_party/skia/include/core/SkColor.h" 20 #include "third_party/skia/include/core/SkColor.h"
21 #include "ui/app_list/views/app_list_drag_and_drop_host.h" 21 #include "ui/app_list/views/app_list_drag_and_drop_host.h"
22 #include "ui/views/animation/bounds_animator_observer.h" 22 #include "ui/views/animation/bounds_animator_observer.h"
23 #include "ui/views/animation/ink_drop_state.h" 23 #include "ui/views/animation/ink_drop_state.h"
24 #include "ui/views/context_menu_controller.h" 24 #include "ui/views/context_menu_controller.h"
25 #include "ui/views/controls/button/button.h" 25 #include "ui/views/controls/button/button.h"
26 #include "ui/views/focus/focus_manager.h" 26 #include "ui/views/focus/focus_manager.h"
(...skipping 448 matching lines...) Expand 10 before | Expand all | Expand 10 after
475 ShelfButtonPressedMetricTracker shelf_button_pressed_metric_tracker_; 475 ShelfButtonPressedMetricTracker shelf_button_pressed_metric_tracker_;
476 476
477 base::WeakPtrFactory<ShelfView> weak_factory_; 477 base::WeakPtrFactory<ShelfView> weak_factory_;
478 478
479 DISALLOW_COPY_AND_ASSIGN(ShelfView); 479 DISALLOW_COPY_AND_ASSIGN(ShelfView);
480 }; 480 };
481 481
482 } // namespace ash 482 } // namespace ash
483 483
484 #endif // ASH_SHELF_SHELF_VIEW_H_ 484 #endif // ASH_SHELF_SHELF_VIEW_H_
OLDNEW
« no previous file with comments | « ash/shelf/shelf_unittest.cc ('k') | ash/shelf/shelf_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698