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

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

Issue 486193004: Ash: Fix browser icon menu model lifetime (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: (menu-leak) simplify Created 6 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | 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 <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 351 matching lines...) Expand 10 before | Expand all | Expand 10 after
362 gfx::Point drag_origin_; 362 gfx::Point drag_origin_;
363 363
364 // Index |drag_view_| was initially at. 364 // Index |drag_view_| was initially at.
365 int start_drag_index_; 365 int start_drag_index_;
366 366
367 // Used for the context menu of a particular item. 367 // Used for the context menu of a particular item.
368 ShelfID context_menu_id_; 368 ShelfID context_menu_id_;
369 369
370 scoped_ptr<views::FocusSearch> focus_search_; 370 scoped_ptr<views::FocusSearch> focus_search_;
371 371
372 scoped_ptr<ui::MenuModel> list_menu_model_;
373
374 scoped_ptr<ui::MenuModel> context_menu_model_; 372 scoped_ptr<ui::MenuModel> context_menu_model_;
375 373
376 scoped_ptr<views::MenuRunner> launcher_menu_runner_; 374 scoped_ptr<views::MenuRunner> launcher_menu_runner_;
377 375
378 ObserverList<ShelfIconObserver> observers_; 376 ObserverList<ShelfIconObserver> observers_;
379 377
380 // Amount content is inset on the left edge (or top edge for vertical 378 // Amount content is inset on the left edge (or top edge for vertical
381 // alignment). 379 // alignment).
382 int leading_inset_; 380 int leading_inset_;
383 381
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
441 439
442 // True when ripped item from overflow bubble is entered into Shelf. 440 // True when ripped item from overflow bubble is entered into Shelf.
443 bool dragged_off_from_overflow_to_shelf_; 441 bool dragged_off_from_overflow_to_shelf_;
444 442
445 DISALLOW_COPY_AND_ASSIGN(ShelfView); 443 DISALLOW_COPY_AND_ASSIGN(ShelfView);
446 }; 444 };
447 445
448 } // namespace ash 446 } // namespace ash
449 447
450 #endif // ASH_SHELF_SHELF_VIEW_H_ 448 #endif // ASH_SHELF_SHELF_VIEW_H_
OLDNEW
« no previous file with comments | « no previous file | ash/shelf/shelf_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698