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

Side by Side Diff: ash/shell_unittest.cc

Issue 174803002: Move root_window.* to window_event_dispatcher.* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 10 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 | Annotate | Revision Log
« no previous file with comments | « ash/shell/window_watcher_unittest.cc ('k') | ash/sticky_keys/sticky_keys_controller.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 (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/desktop_background/desktop_background_widget_controller.h" 11 #include "ash/desktop_background/desktop_background_widget_controller.h"
12 #include "ash/display/mouse_cursor_event_filter.h" 12 #include "ash/display/mouse_cursor_event_filter.h"
13 #include "ash/drag_drop/drag_drop_controller.h" 13 #include "ash/drag_drop/drag_drop_controller.h"
14 #include "ash/root_window_controller.h" 14 #include "ash/root_window_controller.h"
15 #include "ash/session_state_delegate.h" 15 #include "ash/session_state_delegate.h"
16 #include "ash/shelf/shelf.h" 16 #include "ash/shelf/shelf.h"
17 #include "ash/shelf/shelf_layout_manager.h" 17 #include "ash/shelf/shelf_layout_manager.h"
18 #include "ash/shelf/shelf_widget.h" 18 #include "ash/shelf/shelf_widget.h"
19 #include "ash/shell_delegate.h" 19 #include "ash/shell_delegate.h"
20 #include "ash/shell_window_ids.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/root_window_layout_manager.h" 23 #include "ash/wm/root_window_layout_manager.h"
24 #include "ash/wm/window_util.h" 24 #include "ash/wm/window_util.h"
25 #include "base/strings/utf_string_conversions.h" 25 #include "base/strings/utf_string_conversions.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/root_window.h"
29 #include "ui/aura/test/event_generator.h" 28 #include "ui/aura/test/event_generator.h"
30 #include "ui/aura/test/test_event_handler.h" 29 #include "ui/aura/test/test_event_handler.h"
31 #include "ui/aura/window.h" 30 #include "ui/aura/window.h"
31 #include "ui/aura/window_event_dispatcher.h"
32 #include "ui/base/models/simple_menu_model.h" 32 #include "ui/base/models/simple_menu_model.h"
33 #include "ui/events/test/events_test_utils.h" 33 #include "ui/events/test/events_test_utils.h"
34 #include "ui/gfx/size.h" 34 #include "ui/gfx/size.h"
35 #include "ui/views/controls/menu/menu_controller.h" 35 #include "ui/views/controls/menu/menu_controller.h"
36 #include "ui/views/controls/menu/menu_runner.h" 36 #include "ui/views/controls/menu/menu_runner.h"
37 #include "ui/views/widget/widget.h" 37 #include "ui/views/widget/widget.h"
38 #include "ui/views/widget/widget_delegate.h" 38 #include "ui/views/widget/widget_delegate.h"
39 #include "ui/views/window/dialog_delegate.h" 39 #include "ui/views/window/dialog_delegate.h"
40 40
41 using aura::RootWindow; 41 using aura::RootWindow;
(...skipping 487 matching lines...) Expand 10 before | Expand all | Expand 10 after
529 private: 529 private:
530 DISALLOW_COPY_AND_ASSIGN(ShellTest2); 530 DISALLOW_COPY_AND_ASSIGN(ShellTest2);
531 }; 531 };
532 532
533 TEST_F(ShellTest2, DontCrashWhenWindowDeleted) { 533 TEST_F(ShellTest2, DontCrashWhenWindowDeleted) {
534 window_.reset(new aura::Window(NULL)); 534 window_.reset(new aura::Window(NULL));
535 window_->Init(aura::WINDOW_LAYER_NOT_DRAWN); 535 window_->Init(aura::WINDOW_LAYER_NOT_DRAWN);
536 } 536 }
537 537
538 } // namespace ash 538 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shell/window_watcher_unittest.cc ('k') | ash/sticky_keys/sticky_keys_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698