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

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

Issue 538333002: gn/linux: warnings as errors, turn on Wextra (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 6 years, 3 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 | « no previous file | build/config/compiler/BUILD.gn » ('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 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 virtual void UpdateDragIconProxy( 126 virtual void UpdateDragIconProxy(
127 const gfx::Point& location_in_screen_coordinates) OVERRIDE; 127 const gfx::Point& location_in_screen_coordinates) OVERRIDE;
128 virtual void DestroyDragIconProxy() OVERRIDE; 128 virtual void DestroyDragIconProxy() OVERRIDE;
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* view_model_for_test() const {
137 return view_model_.get(); 137 return view_model_.get();
138 } 138 }
139 139
140 private: 140 private:
141 friend class ash::test::ShelfViewTestAPI; 141 friend class ash::test::ShelfViewTestAPI;
142 142
143 class FadeOutAnimationDelegate; 143 class FadeOutAnimationDelegate;
144 class StartFadeAnimationDelegate; 144 class StartFadeAnimationDelegate;
145 145
146 struct IdealBounds { 146 struct IdealBounds {
(...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after
439 439
440 // True when ripped item from overflow bubble is entered into Shelf. 440 // True when ripped item from overflow bubble is entered into Shelf.
441 bool dragged_off_from_overflow_to_shelf_; 441 bool dragged_off_from_overflow_to_shelf_;
442 442
443 DISALLOW_COPY_AND_ASSIGN(ShelfView); 443 DISALLOW_COPY_AND_ASSIGN(ShelfView);
444 }; 444 };
445 445
446 } // namespace ash 446 } // namespace ash
447 447
448 #endif // ASH_SHELF_SHELF_VIEW_H_ 448 #endif // ASH_SHELF_SHELF_VIEW_H_
OLDNEW
« no previous file with comments | « no previous file | build/config/compiler/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698