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

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

Issue 2798173002: mash: Remove ChromeLauncherController's |id_to_item_controller_map_|. (Closed)
Patch Set: Address comment; fix browser tests. Created 3 years, 8 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/common/shelf/shelf_model_unittest.cc ('k') | ash/common/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_COMMON_SHELF_SHELF_VIEW_H_ 5 #ifndef ASH_COMMON_SHELF_SHELF_VIEW_H_
6 #define ASH_COMMON_SHELF_SHELF_VIEW_H_ 6 #define ASH_COMMON_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 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 const ViewHierarchyChangedDetails& details) override; 282 const ViewHierarchyChangedDetails& details) override;
283 283
284 // Overridden from ui::EventHandler: 284 // Overridden from ui::EventHandler:
285 void OnGestureEvent(ui::GestureEvent* event) override; 285 void OnGestureEvent(ui::GestureEvent* event) override;
286 286
287 // Overridden from ShelfModelObserver: 287 // Overridden from ShelfModelObserver:
288 void ShelfItemAdded(int model_index) override; 288 void ShelfItemAdded(int model_index) override;
289 void ShelfItemRemoved(int model_index, const ShelfItem& old_item) override; 289 void ShelfItemRemoved(int model_index, const ShelfItem& old_item) override;
290 void ShelfItemChanged(int model_index, const ShelfItem& old_item) override; 290 void ShelfItemChanged(int model_index, const ShelfItem& old_item) override;
291 void ShelfItemMoved(int start_index, int target_index) override; 291 void ShelfItemMoved(int start_index, int target_index) override;
292 void OnSetShelfItemDelegate(ShelfID, ShelfItemDelegate*) override;
293 292
294 // Handles the result of an item selection, records the |action| taken and 293 // Handles the result of an item selection, records the |action| taken and
295 // optionally shows an application menu with the given |menu_items|. 294 // optionally shows an application menu with the given |menu_items|.
296 void AfterItemSelected( 295 void AfterItemSelected(
297 const ShelfItem& item, 296 const ShelfItem& item,
298 views::Button* sender, 297 views::Button* sender,
299 std::unique_ptr<ui::Event> event, 298 std::unique_ptr<ui::Event> event,
300 views::InkDrop* ink_drop, 299 views::InkDrop* ink_drop,
301 ShelfAction action, 300 ShelfAction action,
302 base::Optional<std::vector<mojom::MenuItemPtr>> menu_items); 301 base::Optional<std::vector<mojom::MenuItemPtr>> menu_items);
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
468 ShelfButtonPressedMetricTracker shelf_button_pressed_metric_tracker_; 467 ShelfButtonPressedMetricTracker shelf_button_pressed_metric_tracker_;
469 468
470 base::WeakPtrFactory<ShelfView> weak_factory_; 469 base::WeakPtrFactory<ShelfView> weak_factory_;
471 470
472 DISALLOW_COPY_AND_ASSIGN(ShelfView); 471 DISALLOW_COPY_AND_ASSIGN(ShelfView);
473 }; 472 };
474 473
475 } // namespace ash 474 } // namespace ash
476 475
477 #endif // ASH_COMMON_SHELF_SHELF_VIEW_H_ 476 #endif // ASH_COMMON_SHELF_SHELF_VIEW_H_
OLDNEW
« no previous file with comments | « ash/common/shelf/shelf_model_unittest.cc ('k') | ash/common/shelf/shelf_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698