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

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

Issue 2187953002: mash: Migrate ShelfButton* to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 #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/common/shelf/ink_drop_button_listener.h" 13 #include "ash/common/shelf/ink_drop_button_listener.h"
14 #include "ash/common/shelf/shelf_button_pressed_metric_tracker.h"
14 #include "ash/common/shelf/shelf_item_delegate.h" 15 #include "ash/common/shelf/shelf_item_delegate.h"
15 #include "ash/common/shelf/shelf_model_observer.h" 16 #include "ash/common/shelf/shelf_model_observer.h"
16 #include "ash/common/shelf/shelf_tooltip_manager.h" 17 #include "ash/common/shelf/shelf_tooltip_manager.h"
17 #include "ash/shelf/shelf_button_pressed_metric_tracker.h"
18 #include "ash/wm/gestures/shelf_gesture_handler.h" 18 #include "ash/wm/gestures/shelf_gesture_handler.h"
19 #include "base/macros.h" 19 #include "base/macros.h"
20 #include "base/observer_list.h" 20 #include "base/observer_list.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"
27 #include "ui/views/view.h" 27 #include "ui/views/view.h"
(...skipping 439 matching lines...) Expand 10 before | Expand all | Expand 10 after
467 467
468 // Tracks UMA metrics based on shelf button press actions. 468 // Tracks UMA metrics based on shelf button press actions.
469 ShelfButtonPressedMetricTracker shelf_button_pressed_metric_tracker_; 469 ShelfButtonPressedMetricTracker shelf_button_pressed_metric_tracker_;
470 470
471 DISALLOW_COPY_AND_ASSIGN(ShelfView); 471 DISALLOW_COPY_AND_ASSIGN(ShelfView);
472 }; 472 };
473 473
474 } // namespace ash 474 } // namespace ash
475 475
476 #endif // ASH_SHELF_SHELF_VIEW_H_ 476 #endif // ASH_SHELF_SHELF_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698