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

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

Issue 1867223004: Convert //ash from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments Created 4 years, 8 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_item_delegate_manager.cc ('k') | ash/shelf/shelf_layout_manager_unittest.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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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_LAYOUT_MANAGER_H_ 5 #ifndef ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
6 #define ASH_SHELF_SHELF_LAYOUT_MANAGER_H_ 6 #define ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
7 7
8 #include <memory>
8 #include <vector> 9 #include <vector>
9 10
10 #include "ash/ash_export.h" 11 #include "ash/ash_export.h"
11 #include "ash/session/session_state_observer.h" 12 #include "ash/session/session_state_observer.h"
12 #include "ash/shelf/background_animator.h" 13 #include "ash/shelf/background_animator.h"
13 #include "ash/shelf/shelf.h" 14 #include "ash/shelf/shelf.h"
14 #include "ash/shelf/shelf_types.h" 15 #include "ash/shelf/shelf_types.h"
15 #include "ash/shell_observer.h" 16 #include "ash/shell_observer.h"
16 #include "ash/snap_to_pixel_layout_manager.h" 17 #include "ash/snap_to_pixel_layout_manager.h"
17 #include "ash/system/status_area_widget.h" 18 #include "ash/system/status_area_widget.h"
(...skipping 329 matching lines...) Expand 10 before | Expand all | Expand 10 after
347 bool window_overlaps_shelf_; 348 bool window_overlaps_shelf_;
348 349
349 base::OneShotTimer auto_hide_timer_; 350 base::OneShotTimer auto_hide_timer_;
350 351
351 // Whether the mouse was over the shelf when the auto hide timer started. 352 // Whether the mouse was over the shelf when the auto hide timer started.
352 // False when neither the auto hide timer nor the timer task are running. 353 // False when neither the auto hide timer nor the timer task are running.
353 bool mouse_over_shelf_when_auto_hide_timer_started_; 354 bool mouse_over_shelf_when_auto_hide_timer_started_;
354 355
355 // EventFilter used to detect when user moves the mouse over the shelf to 356 // EventFilter used to detect when user moves the mouse over the shelf to
356 // trigger showing the shelf. 357 // trigger showing the shelf.
357 scoped_ptr<AutoHideEventFilter> auto_hide_event_filter_; 358 std::unique_ptr<AutoHideEventFilter> auto_hide_event_filter_;
358 359
359 // EventFilter used to detect when user issues a gesture on a bezel sensor. 360 // EventFilter used to detect when user issues a gesture on a bezel sensor.
360 scoped_ptr<ShelfBezelEventFilter> bezel_event_filter_; 361 std::unique_ptr<ShelfBezelEventFilter> bezel_event_filter_;
361 362
362 base::ObserverList<ShelfLayoutManagerObserver> observers_; 363 base::ObserverList<ShelfLayoutManagerObserver> observers_;
363 364
364 // The shelf reacts to gesture-drags, and can be set to auto-hide for certain 365 // The shelf reacts to gesture-drags, and can be set to auto-hide for certain
365 // gestures. Some shelf behaviour (e.g. visibility state, background color 366 // gestures. Some shelf behaviour (e.g. visibility state, background color
366 // etc.) are affected by various stages of the drag. The enum keeps track of 367 // etc.) are affected by various stages of the drag. The enum keeps track of
367 // the present status of the gesture drag. 368 // the present status of the gesture drag.
368 enum GestureDragStatus { 369 enum GestureDragStatus {
369 GESTURE_DRAG_NONE, 370 GESTURE_DRAG_NONE,
370 GESTURE_DRAG_IN_PROGRESS, 371 GESTURE_DRAG_IN_PROGRESS,
(...skipping 28 matching lines...) Expand all
399 400
400 // The show hide animation duration override or 0 for default. 401 // The show hide animation duration override or 0 for default.
401 int duration_override_in_ms_; 402 int duration_override_in_ms_;
402 403
403 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager); 404 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager);
404 }; 405 };
405 406
406 } // namespace ash 407 } // namespace ash
407 408
408 #endif // ASH_SHELF_SHELF_LAYOUT_MANAGER_H_ 409 #endif // ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
OLDNEW
« no previous file with comments | « ash/shelf/shelf_item_delegate_manager.cc ('k') | ash/shelf/shelf_layout_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698