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

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

Issue 909293002: Properly set ShelfAlignment during login (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 | « no previous file | ash/shelf/shelf_layout_manager.cc » ('j') | ash/shelf/shelf_layout_manager.cc » ('J')
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.
tdanderson 2015/02/11 20:32:35 Nit: wrap the lines of your CL description to 80 c
jonross 2015/02/11 22:17:44 Done.
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 <vector> 8 #include <vector>
9 9
10 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
11 #include "ash/session/session_state_observer.h" 11 #include "ash/session/session_state_observer.h"
(...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 void OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) override; 319 void OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) override;
320 320
321 // Overridden from DockedWindowLayoutManagerObserver: 321 // Overridden from DockedWindowLayoutManagerObserver:
322 void OnDockBoundsChanging( 322 void OnDockBoundsChanging(
323 const gfx::Rect& dock_bounds, 323 const gfx::Rect& dock_bounds,
324 DockedWindowLayoutManagerObserver::Reason reason) override; 324 DockedWindowLayoutManagerObserver::Reason reason) override;
325 325
326 // Called when the LoginUI changes from visible to invisible. 326 // Called when the LoginUI changes from visible to invisible.
327 void UpdateShelfVisibilityAfterLoginUIChange(); 327 void UpdateShelfVisibilityAfterLoginUIChange();
328 328
329 // Returns true when |alignment_| should not be used for layout.
330 bool ShouldOverrideAlignment() const;
331
329 // The RootWindow is cached so that we don't invoke Shell::GetInstance() from 332 // The RootWindow is cached so that we don't invoke Shell::GetInstance() from
330 // our destructor. We avoid that as at the time we're deleted Shell is being 333 // our destructor. We avoid that as at the time we're deleted Shell is being
331 // deleted too. 334 // deleted too.
332 aura::Window* root_window_; 335 aura::Window* root_window_;
333 336
334 // True when inside UpdateBoundsAndOpacity() method. Used to prevent calling 337 // True when inside UpdateBoundsAndOpacity() method. Used to prevent calling
335 // UpdateBoundsAndOpacity() again from SetChildBounds(). 338 // UpdateBoundsAndOpacity() again from SetChildBounds().
336 bool updating_bounds_; 339 bool updating_bounds_;
337 340
338 // See description above setter. 341 // See description above setter.
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
396 399
397 // The show hide animation duration override or 0 for default. 400 // The show hide animation duration override or 0 for default.
398 int duration_override_in_ms_; 401 int duration_override_in_ms_;
399 402
400 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager); 403 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager);
401 }; 404 };
402 405
403 } // namespace ash 406 } // namespace ash
404 407
405 #endif // ASH_SHELF_SHELF_LAYOUT_MANAGER_H_ 408 #endif // ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
OLDNEW
« no previous file with comments | « no previous file | ash/shelf/shelf_layout_manager.cc » ('j') | ash/shelf/shelf_layout_manager.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698