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

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: 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') | ash/shelf/shelf_view.cc » ('J')
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 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 virtual bool StartDrag( 129 virtual bool StartDrag(
130 const std::string& app_id, 130 const std::string& app_id,
131 const gfx::Point& location_in_screen_coordinates) OVERRIDE; 131 const gfx::Point& location_in_screen_coordinates) OVERRIDE;
132 virtual bool Drag(const gfx::Point& location_in_screen_coordinates) OVERRIDE; 132 virtual bool Drag(const gfx::Point& location_in_screen_coordinates) OVERRIDE;
133 virtual void EndDrag(bool cancel) OVERRIDE; 133 virtual void EndDrag(bool cancel) OVERRIDE;
134 134
135 // Return the view model for test purposes. 135 // Return the view model for test purposes.
136 const views::ViewModel* const view_model_for_test() const { 136 const views::ViewModel* const view_model_for_test() const {
137 return view_model_.get(); 137 return view_model_.get();
138 } 138 }
139 ui::MenuModel* list_menu_model_for_test() { return list_menu_model_.get(); }
139 140
140 private: 141 private:
141 friend class ash::test::ShelfViewTestAPI; 142 friend class ash::test::ShelfViewTestAPI;
142 143
143 class FadeOutAnimationDelegate; 144 class FadeOutAnimationDelegate;
144 class StartFadeAnimationDelegate; 145 class StartFadeAnimationDelegate;
145 146
146 struct IdealBounds { 147 struct IdealBounds {
147 gfx::Rect overflow_bounds; 148 gfx::Rect overflow_bounds;
148 }; 149 };
(...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after
441 442
442 // True when ripped item from overflow bubble is entered into Shelf. 443 // True when ripped item from overflow bubble is entered into Shelf.
443 bool dragged_off_from_overflow_to_shelf_; 444 bool dragged_off_from_overflow_to_shelf_;
444 445
445 DISALLOW_COPY_AND_ASSIGN(ShelfView); 446 DISALLOW_COPY_AND_ASSIGN(ShelfView);
446 }; 447 };
447 448
448 } // namespace ash 449 } // namespace ash
449 450
450 #endif // ASH_SHELF_SHELF_VIEW_H_ 451 #endif // ASH_SHELF_SHELF_VIEW_H_
OLDNEW
« no previous file with comments | « no previous file | ash/shelf/shelf_view.cc » ('j') | ash/shelf/shelf_view.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698