| OLD | NEW |
| 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 #include "ash/shelf/shelf_layout_manager.h" | 5 #include "ash/shelf/shelf_layout_manager.h" |
| 6 | 6 |
| 7 #include "ash/accelerators/accelerator_controller.h" | 7 #include "ash/accelerators/accelerator_controller.h" |
| 8 #include "ash/accelerators/accelerator_table.h" | 8 #include "ash/accelerators/accelerator_table.h" |
| 9 #include "ash/ash_switches.h" | 9 #include "ash/ash_switches.h" |
| 10 #include "ash/display/display_controller.h" | 10 #include "ash/display/display_controller.h" |
| (...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 324 } | 324 } |
| 325 | 325 |
| 326 void UpdateAutoHideStateNow() { | 326 void UpdateAutoHideStateNow() { |
| 327 GetShelfLayoutManager()->UpdateAutoHideStateNow(); | 327 GetShelfLayoutManager()->UpdateAutoHideStateNow(); |
| 328 } | 328 } |
| 329 | 329 |
| 330 aura::Window* CreateTestWindow() { | 330 aura::Window* CreateTestWindow() { |
| 331 aura::Window* window = new aura::Window(NULL); | 331 aura::Window* window = new aura::Window(NULL); |
| 332 window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_NORMAL); | 332 window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_NORMAL); |
| 333 window->SetType(ui::wm::WINDOW_TYPE_NORMAL); | 333 window->SetType(ui::wm::WINDOW_TYPE_NORMAL); |
| 334 window->Init(aura::WINDOW_LAYER_TEXTURED); | 334 window->Init(ui::LAYER_TEXTURED); |
| 335 ParentWindowInPrimaryRootWindow(window); | 335 ParentWindowInPrimaryRootWindow(window); |
| 336 return window; | 336 return window; |
| 337 } | 337 } |
| 338 | 338 |
| 339 aura::Window* CreateTestWindowInParent(aura::Window* root_window) { | 339 aura::Window* CreateTestWindowInParent(aura::Window* root_window) { |
| 340 aura::Window* window = new aura::Window(NULL); | 340 aura::Window* window = new aura::Window(NULL); |
| 341 window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_NORMAL); | 341 window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_NORMAL); |
| 342 window->SetType(ui::wm::WINDOW_TYPE_NORMAL); | 342 window->SetType(ui::wm::WINDOW_TYPE_NORMAL); |
| 343 window->Init(aura::WINDOW_LAYER_TEXTURED); | 343 window->Init(ui::LAYER_TEXTURED); |
| 344 aura::client::ParentWindowWithContext(window, root_window, gfx::Rect()); | 344 aura::client::ParentWindowWithContext(window, root_window, gfx::Rect()); |
| 345 return window; | 345 return window; |
| 346 } | 346 } |
| 347 | 347 |
| 348 views::Widget* CreateTestWidgetWithParams( | 348 views::Widget* CreateTestWidgetWithParams( |
| 349 const views::Widget::InitParams& params) { | 349 const views::Widget::InitParams& params) { |
| 350 views::Widget* out = new views::Widget; | 350 views::Widget* out = new views::Widget; |
| 351 out->Init(params); | 351 out->Init(params); |
| 352 out->Show(); | 352 out->Show(); |
| 353 return out; | 353 return out; |
| (...skipping 1909 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2263 shelf->ShutdownStatusAreaWidget(); | 2263 shelf->ShutdownStatusAreaWidget(); |
| 2264 shelf_manager->PrepareForShutdown(); | 2264 shelf_manager->PrepareForShutdown(); |
| 2265 | 2265 |
| 2266 // Deleting a focused maximized window will switch focus to |window2|. This | 2266 // Deleting a focused maximized window will switch focus to |window2|. This |
| 2267 // would normally cause the ShelfLayoutManager to update its state. However | 2267 // would normally cause the ShelfLayoutManager to update its state. However |
| 2268 // during shutdown we want to handle this without crashing. | 2268 // during shutdown we want to handle this without crashing. |
| 2269 delete window1; | 2269 delete window1; |
| 2270 } | 2270 } |
| 2271 | 2271 |
| 2272 } // namespace ash | 2272 } // namespace ash |
| OLD | NEW |