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

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: Cleanup. Created 4 years, 5 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>
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 public views::BoundsAnimatorObserver, 69 public views::BoundsAnimatorObserver,
70 public app_list::ApplicationDragAndDropHost { 70 public app_list::ApplicationDragAndDropHost {
71 public: 71 public:
72 ShelfView(ShelfModel* model, 72 ShelfView(ShelfModel* model,
73 ShelfDelegate* delegate, 73 ShelfDelegate* delegate,
74 WmShelf* wm_shelf, 74 WmShelf* wm_shelf,
75 Shelf* shelf); 75 Shelf* shelf);
76 ~ShelfView() override; 76 ~ShelfView() override;
77 77
78 Shelf* shelf() const { return shelf_; } 78 Shelf* shelf() const { return shelf_; }
79 WmShelf* wm_shelf() const { return wm_shelf_; }
79 ShelfModel* model() const { return model_; } 80 ShelfModel* model() const { return model_; }
80 81
81 void Init(); 82 void Init();
82 83
83 void OnShelfAlignmentChanged(); 84 void OnShelfAlignmentChanged();
84 void SchedulePaintForAllButtons(); 85 void SchedulePaintForAllButtons();
85 86
86 // Returns the ideal bounds of the specified item, or an empty rect if id 87 // Returns the ideal bounds of the specified item, or an empty rect if id
87 // isn't know. If the item is in an overflow shelf, the overflow icon location 88 // isn't know. If the item is in an overflow shelf, the overflow icon location
88 // will be returned. 89 // will be returned.
(...skipping 379 matching lines...) Expand 10 before | Expand all | Expand 10 after
468 469
469 // Tracks UMA metrics based on shelf button press actions. 470 // Tracks UMA metrics based on shelf button press actions.
470 ShelfButtonPressedMetricTracker shelf_button_pressed_metric_tracker_; 471 ShelfButtonPressedMetricTracker shelf_button_pressed_metric_tracker_;
471 472
472 DISALLOW_COPY_AND_ASSIGN(ShelfView); 473 DISALLOW_COPY_AND_ASSIGN(ShelfView);
473 }; 474 };
474 475
475 } // namespace ash 476 } // namespace ash
476 477
477 #endif // ASH_SHELF_SHELF_VIEW_H_ 478 #endif // ASH_SHELF_SHELF_VIEW_H_
OLDNEW
« ash/shelf/shelf_tooltip_manager.cc ('K') | « ash/shelf/shelf_tooltip_manager.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698