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

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

Issue 26373009: ash:Shelf - Added UMA stats for ShelfAlignment (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ws Created 7 years, 1 month 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
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 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 const std::string& app_id, 125 const std::string& app_id,
126 const gfx::Point& location_in_screen_coordinates) OVERRIDE; 126 const gfx::Point& location_in_screen_coordinates) OVERRIDE;
127 virtual bool Drag(const gfx::Point& location_in_screen_coordinates) OVERRIDE; 127 virtual bool Drag(const gfx::Point& location_in_screen_coordinates) OVERRIDE;
128 virtual void EndDrag(bool cancel) OVERRIDE; 128 virtual void EndDrag(bool cancel) OVERRIDE;
129 129
130 // Return the view model for test purposes. 130 // Return the view model for test purposes.
131 const views::ViewModel* const view_model_for_test() const { 131 const views::ViewModel* const view_model_for_test() const {
132 return view_model_.get(); 132 return view_model_.get();
133 } 133 }
134 134
135 // See Launcher::RecordCurrentAlignmentForUMAHistogram.
136 void RecordCurrentAlignmentForUMAHistogram(const char* histogram_name);
137
135 private: 138 private:
136 friend class ash::test::ShelfViewTestAPI; 139 friend class ash::test::ShelfViewTestAPI;
137 140
138 class FadeOutAnimationDelegate; 141 class FadeOutAnimationDelegate;
139 class StartFadeAnimationDelegate; 142 class StartFadeAnimationDelegate;
140 143
141 struct IdealBounds { 144 struct IdealBounds {
142 gfx::Rect overflow_bounds; 145 gfx::Rect overflow_bounds;
143 }; 146 };
144 147
(...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after
414 // Holds ShelfLayoutManager. 417 // Holds ShelfLayoutManager.
415 ShelfLayoutManager* layout_manager_; 418 ShelfLayoutManager* layout_manager_;
416 419
417 DISALLOW_COPY_AND_ASSIGN(ShelfView); 420 DISALLOW_COPY_AND_ASSIGN(ShelfView);
418 }; 421 };
419 422
420 } // namespace internal 423 } // namespace internal
421 } // namespace ash 424 } // namespace ash
422 425
423 #endif // ASH_SHELF_SHELF_VIEW_H_ 426 #endif // ASH_SHELF_SHELF_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698