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

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

Issue 10911172: Changes launcher so that when animating hidden the background doesn't (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge 2 trunk Created 8 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « ash/wm/custom_frame_view_ash.cc ('k') | ash/wm/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 (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_WM_SHELF_LAYOUT_MANAGER_H_ 5 #ifndef ASH_WM_SHELF_LAYOUT_MANAGER_H_
6 #define ASH_WM_SHELF_LAYOUT_MANAGER_H_ 6 #define ASH_WM_SHELF_LAYOUT_MANAGER_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/launcher/launcher.h" 9 #include "ash/launcher/launcher.h"
10 #include "ash/shell_observer.h" 10 #include "ash/shell_observer.h"
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 166
167 // Overridden from ash::ShellObserver: 167 // Overridden from ash::ShellObserver:
168 virtual void OnLockStateChanged(bool locked) OVERRIDE; 168 virtual void OnLockStateChanged(bool locked) OVERRIDE;
169 169
170 // Overriden from aura::client::ActivationChangeObserver: 170 // Overriden from aura::client::ActivationChangeObserver:
171 virtual void OnWindowActivated(aura::Window* active, 171 virtual void OnWindowActivated(aura::Window* active,
172 aura::Window* old_active) OVERRIDE; 172 aura::Window* old_active) OVERRIDE;
173 173
174 private: 174 private:
175 class AutoHideEventFilter; 175 class AutoHideEventFilter;
176 class UpdateShelfObserver;
176 friend class ash::ScreenAsh; 177 friend class ash::ScreenAsh;
177 friend class ShelfLayoutManagerTest; 178 friend class ShelfLayoutManagerTest;
178 FRIEND_TEST_ALL_PREFIXES(ShelfLayoutManagerTest, SetAutoHideBehavior); 179 FRIEND_TEST_ALL_PREFIXES(ShelfLayoutManagerTest, SetAutoHideBehavior);
179 180
180 struct TargetBounds { 181 struct TargetBounds {
181 TargetBounds(); 182 TargetBounds();
182 183
183 float opacity; 184 float opacity;
184 gfx::Rect launcher_bounds_in_root; 185 gfx::Rect launcher_bounds_in_root;
185 gfx::Rect status_bounds_in_root; 186 gfx::Rect status_bounds_in_root;
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 }; 300 };
300 GestureDragStatus gesture_drag_status_; 301 GestureDragStatus gesture_drag_status_;
301 302
302 // Tracks the amount of the drag. The value is only valid when 303 // Tracks the amount of the drag. The value is only valid when
303 // |gesture_drag_status_| is set to GESTURE_DRAG_IN_PROGRESS. 304 // |gesture_drag_status_| is set to GESTURE_DRAG_IN_PROGRESS.
304 float gesture_drag_amount_; 305 float gesture_drag_amount_;
305 306
306 // Manage the auto-hide state during the gesture. 307 // Manage the auto-hide state during the gesture.
307 AutoHideState gesture_drag_auto_hide_state_; 308 AutoHideState gesture_drag_auto_hide_state_;
308 309
310 // Used to delay updating shelf background.
311 UpdateShelfObserver* update_shelf_observer_;
312
309 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager); 313 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager);
310 }; 314 };
311 315
312 } // namespace internal 316 } // namespace internal
313 } // namespace ash 317 } // namespace ash
314 318
315 #endif // ASH_WM_SHELF_LAYOUT_MANAGER_H_ 319 #endif // ASH_WM_SHELF_LAYOUT_MANAGER_H_
OLDNEW
« no previous file with comments | « ash/wm/custom_frame_view_ash.cc ('k') | ash/wm/shelf_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698