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

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

Issue 2224653002: mash: Remove ash::ShelfGestureHandler and ui::ET_GESTURE_WIN8_EDGE_SWIPE (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 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
« no previous file with comments | « ash/shelf/shelf_layout_manager_unittest.cc ('k') | 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 <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 "ash/wm/gestures/shelf_gesture_handler.h"
19 #include "base/macros.h" 18 #include "base/macros.h"
20 #include "base/observer_list.h" 19 #include "base/observer_list.h"
21 #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"
22 #include "ui/views/animation/bounds_animator_observer.h" 21 #include "ui/views/animation/bounds_animator_observer.h"
23 #include "ui/views/animation/ink_drop_state.h" 22 #include "ui/views/animation/ink_drop_state.h"
24 #include "ui/views/context_menu_controller.h" 23 #include "ui/views/context_menu_controller.h"
25 #include "ui/views/controls/button/button.h" 24 #include "ui/views/controls/button/button.h"
26 #include "ui/views/focus/focus_manager.h" 25 #include "ui/views/focus/focus_manager.h"
27 #include "ui/views/view.h" 26 #include "ui/views/view.h"
28 #include "ui/views/view_model.h" 27 #include "ui/views/view_model.h"
(...skipping 373 matching lines...) Expand 10 before | Expand all | Expand 10 after
402 std::unique_ptr<views::MenuRunner> launcher_menu_runner_; 401 std::unique_ptr<views::MenuRunner> launcher_menu_runner_;
403 std::unique_ptr<ScopedRootWindowForNewWindows> 402 std::unique_ptr<ScopedRootWindowForNewWindows>
404 scoped_root_window_for_new_windows_; 403 scoped_root_window_for_new_windows_;
405 404
406 base::ObserverList<ShelfIconObserver> observers_; 405 base::ObserverList<ShelfIconObserver> observers_;
407 406
408 // Amount content is inset on the left edge (or top edge for vertical 407 // Amount content is inset on the left edge (or top edge for vertical
409 // alignment). 408 // alignment).
410 int leading_inset_; 409 int leading_inset_;
411 410
412 ShelfGestureHandler gesture_handler_;
413
414 // True when an item being inserted or removed in the model cancels a drag. 411 // True when an item being inserted or removed in the model cancels a drag.
415 bool cancelling_drag_model_changed_; 412 bool cancelling_drag_model_changed_;
416 413
417 // Index of the last hidden launcher item. If there are no hidden items this 414 // Index of the last hidden launcher item. If there are no hidden items this
418 // will be equal to last_visible_index_ + 1. 415 // will be equal to last_visible_index_ + 1.
419 mutable int last_hidden_index_; 416 mutable int last_hidden_index_;
420 417
421 // The timestamp of the event which closed the last menu - or 0. 418 // The timestamp of the event which closed the last menu - or 0.
422 base::TimeTicks closing_event_time_; 419 base::TimeTicks closing_event_time_;
423 420
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
471 468
472 // Tracks UMA metrics based on shelf button press actions. 469 // Tracks UMA metrics based on shelf button press actions.
473 ShelfButtonPressedMetricTracker shelf_button_pressed_metric_tracker_; 470 ShelfButtonPressedMetricTracker shelf_button_pressed_metric_tracker_;
474 471
475 DISALLOW_COPY_AND_ASSIGN(ShelfView); 472 DISALLOW_COPY_AND_ASSIGN(ShelfView);
476 }; 473 };
477 474
478 } // namespace ash 475 } // namespace ash
479 476
480 #endif // ASH_SHELF_SHELF_VIEW_H_ 477 #endif // ASH_SHELF_SHELF_VIEW_H_
OLDNEW
« no previous file with comments | « ash/shelf/shelf_layout_manager_unittest.cc ('k') | ash/shelf/shelf_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698