| 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/shell.h" | 5 #include "ash/shell.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "ash/ash_switches.h" | 10 #include "ash/ash_switches.h" |
| 11 #include "ash/common/shell_window_ids.h" |
| 11 #include "ash/desktop_background/desktop_background_widget_controller.h" | 12 #include "ash/desktop_background/desktop_background_widget_controller.h" |
| 12 #include "ash/display/mouse_cursor_event_filter.h" | 13 #include "ash/display/mouse_cursor_event_filter.h" |
| 13 #include "ash/drag_drop/drag_drop_controller.h" | 14 #include "ash/drag_drop/drag_drop_controller.h" |
| 14 #include "ash/root_window_controller.h" | 15 #include "ash/root_window_controller.h" |
| 15 #include "ash/session/session_state_delegate.h" | 16 #include "ash/session/session_state_delegate.h" |
| 16 #include "ash/shelf/shelf.h" | 17 #include "ash/shelf/shelf.h" |
| 17 #include "ash/shelf/shelf_layout_manager.h" | 18 #include "ash/shelf/shelf_layout_manager.h" |
| 18 #include "ash/shelf/shelf_widget.h" | 19 #include "ash/shelf/shelf_widget.h" |
| 19 #include "ash/shell_delegate.h" | 20 #include "ash/shell_delegate.h" |
| 20 #include "ash/shell_window_ids.h" | |
| 21 #include "ash/test/ash_test_base.h" | 21 #include "ash/test/ash_test_base.h" |
| 22 #include "ash/test/shell_test_api.h" | 22 #include "ash/test/shell_test_api.h" |
| 23 #include "ash/wm/window_util.h" | 23 #include "ash/wm/window_util.h" |
| 24 #include "base/strings/utf_string_conversions.h" | 24 #include "base/strings/utf_string_conversions.h" |
| 25 #include "base/threading/thread_task_runner_handle.h" | 25 #include "base/threading/thread_task_runner_handle.h" |
| 26 #include "ui/aura/client/aura_constants.h" | 26 #include "ui/aura/client/aura_constants.h" |
| 27 #include "ui/aura/env.h" | 27 #include "ui/aura/env.h" |
| 28 #include "ui/aura/window.h" | 28 #include "ui/aura/window.h" |
| 29 #include "ui/aura/window_event_dispatcher.h" | 29 #include "ui/aura/window_event_dispatcher.h" |
| 30 #include "ui/base/models/simple_menu_model.h" | 30 #include "ui/base/models/simple_menu_model.h" |
| (...skipping 485 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 516 private: | 516 private: |
| 517 DISALLOW_COPY_AND_ASSIGN(ShellTest2); | 517 DISALLOW_COPY_AND_ASSIGN(ShellTest2); |
| 518 }; | 518 }; |
| 519 | 519 |
| 520 TEST_F(ShellTest2, DontCrashWhenWindowDeleted) { | 520 TEST_F(ShellTest2, DontCrashWhenWindowDeleted) { |
| 521 window_.reset(new aura::Window(NULL)); | 521 window_.reset(new aura::Window(NULL)); |
| 522 window_->Init(ui::LAYER_NOT_DRAWN); | 522 window_->Init(ui::LAYER_NOT_DRAWN); |
| 523 } | 523 } |
| 524 | 524 |
| 525 } // namespace ash | 525 } // namespace ash |
| OLD | NEW |