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

Side by Side Diff: ash/root_window_controller_unittest.cc

Issue 11363124: Move DisplayManager and DisplayChangeObserverX11 from aura to ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix rebase Created 8 years, 1 month 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/root_window_controller.cc ('k') | ash/screen_ash.h » ('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/root_window_controller.h" 5 #include "ash/root_window_controller.h"
6 6
7 #include "ash/display/display_controller.h" 7 #include "ash/display/display_controller.h"
8 #include "ash/display/multi_display_manager.h"
9 #include "ash/shell.h" 8 #include "ash/shell.h"
10 #include "ash/shell_delegate.h" 9 #include "ash/shell_delegate.h"
11 #include "ash/shell_window_ids.h" 10 #include "ash/shell_window_ids.h"
12 #include "ash/system/tray/system_tray_delegate.h" 11 #include "ash/system/tray/system_tray_delegate.h"
13 #include "ash/test/ash_test_base.h" 12 #include "ash/test/ash_test_base.h"
14 #include "ash/wm/system_modal_container_layout_manager.h" 13 #include "ash/wm/system_modal_container_layout_manager.h"
15 #include "ash/wm/window_util.h" 14 #include "ash/wm/window_util.h"
16 #include "ui/aura/env.h" 15 #include "ui/aura/env.h"
17 #include "ui/aura/focus_manager.h" 16 #include "ui/aura/focus_manager.h"
18 #include "ui/aura/root_window.h" 17 #include "ui/aura/root_window.h"
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after
310 views::Widget* session_modal_widget = 309 views::Widget* session_modal_widget =
311 CreateModalWidget(gfx::Rect(300, 10, 100, 100)); 310 CreateModalWidget(gfx::Rect(300, 10, 100, 100));
312 EXPECT_EQ(Shell::GetContainer(controller->root_window(), 311 EXPECT_EQ(Shell::GetContainer(controller->root_window(),
313 internal::kShellWindowId_SystemModalContainer)->layout_manager(), 312 internal::kShellWindowId_SystemModalContainer)->layout_manager(),
314 controller->GetSystemModalLayoutManager( 313 controller->GetSystemModalLayoutManager(
315 session_modal_widget->GetNativeView())); 314 session_modal_widget->GetNativeView()));
316 } 315 }
317 316
318 } // namespace test 317 } // namespace test
319 } // namespace ash 318 } // namespace ash
OLDNEW
« no previous file with comments | « ash/root_window_controller.cc ('k') | ash/screen_ash.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698