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

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

Issue 1743493002: Cleanup ash shelf accessor functions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Revert ash/shelf/shelf_widget.cc for browser_tests crash... Created 4 years, 9 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 | « ash/shelf/shelf_button.cc ('k') | 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 <vector> 8 #include <vector>
9 9
10 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 return IsHorizontalAlignment() ? horizontal : vertical; 212 return IsHorizontalAlignment() ? horizontal : vertical;
213 } 213 }
214 214
215 // Is the shelf's alignment horizontal? 215 // Is the shelf's alignment horizontal?
216 bool IsHorizontalAlignment() const; 216 bool IsHorizontalAlignment() const;
217 217
218 // Set the height of the ChromeVox panel, which takes away space from the 218 // Set the height of the ChromeVox panel, which takes away space from the
219 // available work area from the top of the screen. 219 // available work area from the top of the screen.
220 void SetChromeVoxPanelHeight(int height); 220 void SetChromeVoxPanelHeight(int height);
221 221
222 // Returns a ShelfLayoutManager on the display which has a shelf for
223 // given |window|. See RootWindowController::ForShelf for more info.
224 static ShelfLayoutManager* ForShelf(aura::Window* window);
225
226 private: 222 private:
227 class AutoHideEventFilter; 223 class AutoHideEventFilter;
228 class UpdateShelfObserver; 224 class UpdateShelfObserver;
229 friend class AshPopupAlignmentDelegateTest; 225 friend class AshPopupAlignmentDelegateTest;
230 friend class ash::ScreenAsh; 226 friend class ash::ScreenAsh;
231 friend class PanelLayoutManagerTest; 227 friend class PanelLayoutManagerTest;
232 friend class ShelfLayoutManagerTest; 228 friend class ShelfLayoutManagerTest;
233 FRIEND_TEST_ALL_PREFIXES(ash::AshPopupAlignmentDelegateTest, AutoHide); 229 FRIEND_TEST_ALL_PREFIXES(ash::AshPopupAlignmentDelegateTest, AutoHide);
234 FRIEND_TEST_ALL_PREFIXES(ash::WebNotificationTrayTest, PopupAndFullscreen); 230 FRIEND_TEST_ALL_PREFIXES(ash::WebNotificationTrayTest, PopupAndFullscreen);
235 231
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
415 411
416 // The show hide animation duration override or 0 for default. 412 // The show hide animation duration override or 0 for default.
417 int duration_override_in_ms_; 413 int duration_override_in_ms_;
418 414
419 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager); 415 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager);
420 }; 416 };
421 417
422 } // namespace ash 418 } // namespace ash
423 419
424 #endif // ASH_SHELF_SHELF_LAYOUT_MANAGER_H_ 420 #endif // ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
OLDNEW
« no previous file with comments | « ash/shelf/shelf_button.cc ('k') | ash/shelf/shelf_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698