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

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

Issue 2176813002: mash: Migrate ShelfTooltipManager to wm common types. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update comment. 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
« no previous file with comments | « ash/shelf/shelf_tooltip_manager_unittest.cc ('k') | ash/shelf/shelf_view_unittest.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/common/shelf/ink_drop_button_listener.h" 13 #include "ash/common/shelf/ink_drop_button_listener.h"
14 #include "ash/common/shelf/shelf_item_delegate.h" 14 #include "ash/common/shelf/shelf_item_delegate.h"
15 #include "ash/common/shelf/shelf_model_observer.h" 15 #include "ash/common/shelf/shelf_model_observer.h"
16 #include "ash/common/shelf/shelf_tooltip_manager.h"
16 #include "ash/shelf/shelf_button_pressed_metric_tracker.h" 17 #include "ash/shelf/shelf_button_pressed_metric_tracker.h"
17 #include "ash/shelf/shelf_tooltip_manager.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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 public views::BoundsAnimatorObserver, 68 public views::BoundsAnimatorObserver,
69 public app_list::ApplicationDragAndDropHost { 69 public app_list::ApplicationDragAndDropHost {
70 public: 70 public:
71 ShelfView(ShelfModel* model, 71 ShelfView(ShelfModel* model,
72 ShelfDelegate* delegate, 72 ShelfDelegate* delegate,
73 WmShelf* wm_shelf, 73 WmShelf* wm_shelf,
74 Shelf* shelf); 74 Shelf* shelf);
75 ~ShelfView() override; 75 ~ShelfView() override;
76 76
77 Shelf* shelf() const { return shelf_; } 77 Shelf* shelf() const { return shelf_; }
78 WmShelf* wm_shelf() const { return wm_shelf_; }
78 ShelfModel* model() const { return model_; } 79 ShelfModel* model() const { return model_; }
79 80
80 void Init(); 81 void Init();
81 82
82 void OnShelfAlignmentChanged(); 83 void OnShelfAlignmentChanged();
83 void SchedulePaintForAllButtons(); 84 void SchedulePaintForAllButtons();
84 85
85 // Returns the ideal bounds of the specified item, or an empty rect if id 86 // Returns the ideal bounds of the specified item, or an empty rect if id
86 // isn't know. If the item is in an overflow shelf, the overflow icon location 87 // isn't know. If the item is in an overflow shelf, the overflow icon location
87 // will be returned. 88 // will be returned.
(...skipping 378 matching lines...) Expand 10 before | Expand all | Expand 10 after
466 467
467 // Tracks UMA metrics based on shelf button press actions. 468 // Tracks UMA metrics based on shelf button press actions.
468 ShelfButtonPressedMetricTracker shelf_button_pressed_metric_tracker_; 469 ShelfButtonPressedMetricTracker shelf_button_pressed_metric_tracker_;
469 470
470 DISALLOW_COPY_AND_ASSIGN(ShelfView); 471 DISALLOW_COPY_AND_ASSIGN(ShelfView);
471 }; 472 };
472 473
473 } // namespace ash 474 } // namespace ash
474 475
475 #endif // ASH_SHELF_SHELF_VIEW_H_ 476 #endif // ASH_SHELF_SHELF_VIEW_H_
OLDNEW
« no previous file with comments | « ash/shelf/shelf_tooltip_manager_unittest.cc ('k') | ash/shelf/shelf_view_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698