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

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

Issue 10979090: Simplify WorkAreaBounds access logic (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 2 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/screen_ash_unittest.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 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 (visibility_state != AUTO_HIDE || 207 (visibility_state != AUTO_HIDE ||
208 other.auto_hide_state == auto_hide_state) && 208 other.auto_hide_state == auto_hide_state) &&
209 other.is_screen_locked == is_screen_locked; 209 other.is_screen_locked == is_screen_locked;
210 } 210 }
211 211
212 VisibilityState visibility_state; 212 VisibilityState visibility_state;
213 AutoHideState auto_hide_state; 213 AutoHideState auto_hide_state;
214 bool is_screen_locked; 214 bool is_screen_locked;
215 }; 215 };
216 216
217 // Returns the bounds the specified window should be when maximized.
218 gfx::Rect GetMaximizedWindowBounds(aura::Window* window);
219 gfx::Rect GetUnmaximizedWorkAreaBounds(aura::Window* window);
220
221 // Sets the visibility of the shelf to |state|. 217 // Sets the visibility of the shelf to |state|.
222 void SetState(VisibilityState visibility_state); 218 void SetState(VisibilityState visibility_state);
223 219
224 // Stops any animations. 220 // Stops any animations.
225 void StopAnimating(); 221 void StopAnimating();
226 222
227 // Returns the width (if aligned to the side) or height (if aligned to the 223 // Returns the width (if aligned to the side) or height (if aligned to the
228 // bottom). 224 // bottom).
229 void GetShelfSize(int* width, int* height); 225 void GetShelfSize(int* width, int* height);
230 226
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
317 // Used to delay updating shelf background. 313 // Used to delay updating shelf background.
318 UpdateShelfObserver* update_shelf_observer_; 314 UpdateShelfObserver* update_shelf_observer_;
319 315
320 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager); 316 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager);
321 }; 317 };
322 318
323 } // namespace internal 319 } // namespace internal
324 } // namespace ash 320 } // namespace ash
325 321
326 #endif // ASH_WM_SHELF_LAYOUT_MANAGER_H_ 322 #endif // ASH_WM_SHELF_LAYOUT_MANAGER_H_
OLDNEW
« no previous file with comments | « ash/screen_ash_unittest.cc ('k') | ash/wm/shelf_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698