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

Side by Side Diff: ash/shell_unittest.cc

Issue 2118593002: mash: Migrate ShellDelegate ownership and access to WmShell. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Cleanup. Created 4 years, 5 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
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 #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/common/ash_switches.h" 10 #include "ash/common/ash_switches.h"
11 #include "ash/common/session/session_state_delegate.h" 11 #include "ash/common/session/session_state_delegate.h"
12 #include "ash/common/shell_window_ids.h" 12 #include "ash/common/shell_window_ids.h"
13 #include "ash/common/wm_shell.h" 13 #include "ash/common/wm_shell.h"
14 #include "ash/desktop_background/desktop_background_widget_controller.h" 14 #include "ash/desktop_background/desktop_background_widget_controller.h"
15 #include "ash/display/mouse_cursor_event_filter.h" 15 #include "ash/display/mouse_cursor_event_filter.h"
16 #include "ash/drag_drop/drag_drop_controller.h" 16 #include "ash/drag_drop/drag_drop_controller.h"
17 #include "ash/root_window_controller.h" 17 #include "ash/root_window_controller.h"
18 #include "ash/shelf/shelf.h" 18 #include "ash/shelf/shelf.h"
19 #include "ash/shelf/shelf_layout_manager.h" 19 #include "ash/shelf/shelf_layout_manager.h"
20 #include "ash/shelf/shelf_widget.h" 20 #include "ash/shelf/shelf_widget.h"
21 #include "ash/shell_delegate.h"
22 #include "ash/test/ash_test_base.h" 21 #include "ash/test/ash_test_base.h"
23 #include "ash/test/shell_test_api.h" 22 #include "ash/test/shell_test_api.h"
24 #include "ash/wm/window_util.h" 23 #include "ash/wm/window_util.h"
25 #include "base/strings/utf_string_conversions.h" 24 #include "base/strings/utf_string_conversions.h"
26 #include "base/threading/thread_task_runner_handle.h" 25 #include "base/threading/thread_task_runner_handle.h"
27 #include "ui/aura/client/aura_constants.h" 26 #include "ui/aura/client/aura_constants.h"
28 #include "ui/aura/env.h" 27 #include "ui/aura/env.h"
29 #include "ui/aura/window.h" 28 #include "ui/aura/window.h"
30 #include "ui/aura/window_event_dispatcher.h" 29 #include "ui/aura/window_event_dispatcher.h"
31 #include "ui/base/models/simple_menu_model.h" 30 #include "ui/base/models/simple_menu_model.h"
(...skipping 477 matching lines...) Expand 10 before | Expand all | Expand 10 after
509 private: 508 private:
510 DISALLOW_COPY_AND_ASSIGN(ShellTest2); 509 DISALLOW_COPY_AND_ASSIGN(ShellTest2);
511 }; 510 };
512 511
513 TEST_F(ShellTest2, DontCrashWhenWindowDeleted) { 512 TEST_F(ShellTest2, DontCrashWhenWindowDeleted) {
514 window_.reset(new aura::Window(NULL)); 513 window_.reset(new aura::Window(NULL));
515 window_->Init(ui::LAYER_NOT_DRAWN); 514 window_->Init(ui::LAYER_NOT_DRAWN);
516 } 515 }
517 516
518 } // namespace ash 517 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698