summaryrefslogtreecommitdiffstats
path: root/ash/root_window_controller.cc
diff options
context:
space:
mode:
authormsw <msw@chromium.org>2016-02-29 20:15:06 -0800
committerCommit bot <commit-bot@chromium.org>2016-03-01 04:17:15 +0000
commita7e8a5f5cabcd125f82b6a204cf1210dad41a1f7 (patch)
tree17b06927c75372b2560be2a59dbf8bf8734109f2 /ash/root_window_controller.cc
parent3b893b5d0e87958af8ebdbefbaaa932088e26fee (diff)
downloadchromium_src-a7e8a5f5cabcd125f82b6a204cf1210dad41a1f7.zip
chromium_src-a7e8a5f5cabcd125f82b6a204cf1210dad41a1f7.tar.gz
chromium_src-a7e8a5f5cabcd125f82b6a204cf1210dad41a1f7.tar.bz2
Cleanup ash shelf accessor functions.
Remove RootWindowController::ForShelf, use ForWindow instead. Remove ShelfLayoutManager::ForShelf, use Shelf::For*, etc. Avoid direct RootWindowController use with Shelf::ForWindow. Add Shelf::shelf_layout_manager() accessor via ShelfWidget. (avoid Shelf::ForWindow in shell.cc for ShelfDelegate init path) (No Shelf exists for ShelfWidget::CreateShelf's delegate init) Make ShelfView take a Shelf* pointer; not ShelfLayoutManager. Add Shelf alignment helpers to avoid ShelfLayoutManager use. Miscellaneous refactoring of shelf object access callsites. TODO: Remove Shell::[G|S]etShelfAutoHideBehavior TODO: Remove Shell::[G|S]etShelfAlignment BUG=557406 TEST=No regressions or behavior changes. R=sky@chromium.org Review URL: https://codereview.chromium.org/1743493002 Cr-Commit-Position: refs/heads/master@{#378392}
Diffstat (limited to 'ash/root_window_controller.cc')
-rw-r--r--ash/root_window_controller.cc7
1 files changed, 0 insertions, 7 deletions
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc
index c130e0f..1ae8355 100644
--- a/ash/root_window_controller.cc
+++ b/ash/root_window_controller.cc
@@ -274,13 +274,6 @@ void RootWindowController::CreateForSecondaryDisplay(AshWindowTreeHost* host) {
}
// static
-RootWindowController* RootWindowController::ForShelf(
- const aura::Window* window) {
- CHECK(Shell::HasInstance());
- return GetRootWindowController(window->GetRootWindow());
-}
-
-// static
RootWindowController* RootWindowController::ForWindow(
const aura::Window* window) {
CHECK(Shell::HasInstance());