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

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

Issue 2225083003: mash: Add WmShell::SetDisplayWorkAreaInsets for ShelfLayoutManager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync and 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
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 <memory>
9 9
10 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
(...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after
294 // Returns true if there is a fullscreen window open that causes the shelf 294 // Returns true if there is a fullscreen window open that causes the shelf
295 // to be hidden. 295 // to be hidden.
296 bool IsShelfHiddenForFullscreen() const; 296 bool IsShelfHiddenForFullscreen() const;
297 297
298 // Gesture related functions: 298 // Gesture related functions:
299 void StartGestureDrag(const ui::GestureEvent& gesture); 299 void StartGestureDrag(const ui::GestureEvent& gesture);
300 void UpdateGestureDrag(const ui::GestureEvent& gesture); 300 void UpdateGestureDrag(const ui::GestureEvent& gesture);
301 void CompleteGestureDrag(const ui::GestureEvent& gesture); 301 void CompleteGestureDrag(const ui::GestureEvent& gesture);
302 void CancelGestureDrag(); 302 void CancelGestureDrag();
303 303
304 // The RootWindow is cached so that we don't invoke Shell::GetInstance() from
305 // our destructor. We avoid that as at the time we're deleted Shell is being
306 // deleted too.
307 aura::Window* root_window_;
James Cook 2016/08/08 23:40:04 Nice that you could get rid of this.
msw 2016/08/08 23:58:39 Acknowledged.
308
309 // True when inside UpdateBoundsAndOpacity() method. Used to prevent calling 304 // True when inside UpdateBoundsAndOpacity() method. Used to prevent calling
310 // UpdateBoundsAndOpacity() again from SetChildBounds(). 305 // UpdateBoundsAndOpacity() again from SetChildBounds().
311 bool updating_bounds_; 306 bool updating_bounds_;
312 307
313 bool in_shutdown_ = false; 308 bool in_shutdown_ = false;
314 309
315 // Current state. 310 // Current state.
316 State state_; 311 State state_;
317 312
318 ShelfWidget* shelf_widget_; 313 ShelfWidget* shelf_widget_;
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
378 373
379 std::unique_ptr<RootWindowControllerObserverImpl> 374 std::unique_ptr<RootWindowControllerObserverImpl>
380 root_window_controller_observer_; 375 root_window_controller_observer_;
381 376
382 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager); 377 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager);
383 }; 378 };
384 379
385 } // namespace ash 380 } // namespace ash
386 381
387 #endif // ASH_SHELF_SHELF_LAYOUT_MANAGER_H_ 382 #endif // ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698