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

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

Issue 2679133003: [ash-md] Wired in the Shelf color to be derived from the Wallpaper. (Closed)
Patch Set: Addressed nits. Created 3 years, 10 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_constants.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>
11 #include <vector> 11 #include <vector>
12 12
13 #include "ash/common/shelf/ink_drop_button_listener.h" 13 #include "ash/common/shelf/ink_drop_button_listener.h"
14 #include "ash/common/shelf/shelf_button_pressed_metric_tracker.h" 14 #include "ash/common/shelf/shelf_button_pressed_metric_tracker.h"
15 #include "ash/common/shelf/shelf_item_delegate.h" 15 #include "ash/common/shelf/shelf_item_delegate.h"
16 #include "ash/common/shelf/shelf_model_observer.h" 16 #include "ash/common/shelf/shelf_model_observer.h"
17 #include "ash/common/shelf/shelf_tooltip_manager.h" 17 #include "ash/common/shelf/shelf_tooltip_manager.h"
18 #include "base/macros.h" 18 #include "base/macros.h"
19 #include "third_party/skia/include/core/SkColor.h"
19 #include "ui/app_list/views/app_list_drag_and_drop_host.h" 20 #include "ui/app_list/views/app_list_drag_and_drop_host.h"
20 #include "ui/views/animation/bounds_animator_observer.h" 21 #include "ui/views/animation/bounds_animator_observer.h"
21 #include "ui/views/animation/ink_drop_state.h" 22 #include "ui/views/animation/ink_drop_state.h"
22 #include "ui/views/context_menu_controller.h" 23 #include "ui/views/context_menu_controller.h"
23 #include "ui/views/controls/button/button.h" 24 #include "ui/views/controls/button/button.h"
24 #include "ui/views/focus/focus_manager.h" 25 #include "ui/views/focus/focus_manager.h"
25 #include "ui/views/view.h" 26 #include "ui/views/view.h"
26 #include "ui/views/view_model.h" 27 #include "ui/views/view_model.h"
27 28
28 namespace ui { 29 namespace ui {
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 Pointer pointer, 151 Pointer pointer,
151 const ui::LocatedEvent& event); 152 const ui::LocatedEvent& event);
152 void PointerDraggedOnButton(views::View* view, 153 void PointerDraggedOnButton(views::View* view,
153 Pointer pointer, 154 Pointer pointer,
154 const ui::LocatedEvent& event); 155 const ui::LocatedEvent& event);
155 void PointerReleasedOnButton(views::View* view, 156 void PointerReleasedOnButton(views::View* view,
156 Pointer pointer, 157 Pointer pointer,
157 bool canceled); 158 bool canceled);
158 159
159 // Updates the background for the shelf items. 160 // Updates the background for the shelf items.
160 void UpdateShelfItemBackground(int alpha); 161 void UpdateShelfItemBackground(SkColor color);
161 162
162 // Return the view model for test purposes. 163 // Return the view model for test purposes.
163 const views::ViewModel* view_model_for_test() const { 164 const views::ViewModel* view_model_for_test() const {
164 return view_model_.get(); 165 return view_model_.get();
165 } 166 }
166 167
167 private: 168 private:
168 friend class ash::test::ShelfViewTestAPI; 169 friend class ash::test::ShelfViewTestAPI;
169 170
170 class FadeOutAnimationDelegate; 171 class FadeOutAnimationDelegate;
(...skipping 289 matching lines...) Expand 10 before | Expand all | Expand 10 after
460 461
461 // Tracks UMA metrics based on shelf button press actions. 462 // Tracks UMA metrics based on shelf button press actions.
462 ShelfButtonPressedMetricTracker shelf_button_pressed_metric_tracker_; 463 ShelfButtonPressedMetricTracker shelf_button_pressed_metric_tracker_;
463 464
464 DISALLOW_COPY_AND_ASSIGN(ShelfView); 465 DISALLOW_COPY_AND_ASSIGN(ShelfView);
465 }; 466 };
466 467
467 } // namespace ash 468 } // namespace ash
468 469
469 #endif // ASH_COMMON_SHELF_SHELF_VIEW_H_ 470 #endif // ASH_COMMON_SHELF_SHELF_VIEW_H_
OLDNEW
« no previous file with comments | « ash/common/shelf/shelf_constants.cc ('k') | ash/common/shelf/shelf_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698