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

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

Issue 1964633002: Fix mash shelf alignment change layout regression. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Use ash::Shell::GetInstance()->in_mus() instead. Created 4 years, 7 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') | 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 <memory>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 // shelf. Specifying 0 leads to use the default. 149 // shelf. Specifying 0 leads to use the default.
150 void SetAnimationDurationOverride(int duration_override_in_ms); 150 void SetAnimationDurationOverride(int duration_override_in_ms);
151 151
152 // Overridden from SnapLayoutManager: 152 // Overridden from SnapLayoutManager:
153 void OnWindowResized() override; 153 void OnWindowResized() override;
154 void SetChildBounds(aura::Window* child, 154 void SetChildBounds(aura::Window* child,
155 const gfx::Rect& requested_bounds) override; 155 const gfx::Rect& requested_bounds) override;
156 156
157 // Overridden from ash::ShellObserver: 157 // Overridden from ash::ShellObserver:
158 void OnLockStateChanged(bool locked) override; 158 void OnLockStateChanged(bool locked) override;
159 void OnShelfAlignmentChanged(aura::Window* root_window) override;
159 void OnShelfAutoHideBehaviorChanged(aura::Window* root_window) override; 160 void OnShelfAutoHideBehaviorChanged(aura::Window* root_window) override;
160 161
161 // Overriden from aura::client::ActivationChangeObserver: 162 // Overriden from aura::client::ActivationChangeObserver:
162 void OnWindowActivated( 163 void OnWindowActivated(
163 aura::client::ActivationChangeObserver::ActivationReason reason, 164 aura::client::ActivationChangeObserver::ActivationReason reason,
164 aura::Window* gained_active, 165 aura::Window* gained_active,
165 aura::Window* lost_active) override; 166 aura::Window* lost_active) override;
166 167
167 // Overridden from ash::LockStateObserver: 168 // Overridden from ash::LockStateObserver:
168 void OnLockStateEvent(LockStateObserver::EventType event) override; 169 void OnLockStateEvent(LockStateObserver::EventType event) override;
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
400 401
401 std::unique_ptr<RootWindowControllerObserverImpl> 402 std::unique_ptr<RootWindowControllerObserverImpl>
402 root_window_controller_observer_; 403 root_window_controller_observer_;
403 404
404 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager); 405 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager);
405 }; 406 };
406 407
407 } // namespace ash 408 } // namespace ash
408 409
409 #endif // ASH_SHELF_SHELF_LAYOUT_MANAGER_H_ 410 #endif // ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
OLDNEW
« no previous file with comments | « no previous file | ash/shelf/shelf_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698