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

Side by Side Diff: ui/aura_shell/modal_container_layout_manager_unittest.cc

Issue 8598031: views: Move widget/ directory to ui/views. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: reland for real Created 9 years 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "ui/aura_shell/modal_container_layout_manager.h" 5 #include "ui/aura_shell/modal_container_layout_manager.h"
6 6
7 #include "base/compiler_specific.h" 7 #include "base/compiler_specific.h"
8 #include "ui/aura/desktop.h" 8 #include "ui/aura/desktop.h"
9 #include "ui/aura/test/event_generator.h" 9 #include "ui/aura/test/event_generator.h"
10 #include "ui/aura/window.h" 10 #include "ui/aura/window.h"
11 #include "ui/aura_shell/shell.h" 11 #include "ui/aura_shell/shell.h"
12 #include "ui/aura_shell/shell_window_ids.h" 12 #include "ui/aura_shell/shell_window_ids.h"
13 #include "ui/aura_shell/test/aura_shell_test_base.h" 13 #include "ui/aura_shell/test/aura_shell_test_base.h"
14 #include "views/widget/widget.h" 14 #include "ui/views/widget/widget.h"
15 #include "views/widget/widget_delegate.h" 15 #include "ui/views/widget/widget_delegate.h"
16 16
17 namespace aura_shell { 17 namespace aura_shell {
18 namespace test { 18 namespace test {
19 19
20 namespace { 20 namespace {
21 21
22 aura::Window* GetModalContainer() { 22 aura::Window* GetModalContainer() {
23 return Shell::GetInstance()->GetContainer( 23 return Shell::GetInstance()->GetContainer(
24 aura_shell::internal::kShellWindowId_ModalContainer); 24 aura_shell::internal::kShellWindowId_ModalContainer);
25 } 25 }
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 EXPECT_EQ(parent.get(), aura::Desktop::GetInstance()->active_window()); 164 EXPECT_EQ(parent.get(), aura::Desktop::GetInstance()->active_window());
165 165
166 // Attempting to click unrelated should activate it. 166 // Attempting to click unrelated should activate it.
167 aura::test::EventGenerator e2(unrelated.get()); 167 aura::test::EventGenerator e2(unrelated.get());
168 e2.ClickLeftButton(); 168 e2.ClickLeftButton();
169 EXPECT_EQ(unrelated.get(), aura::Desktop::GetInstance()->active_window()); 169 EXPECT_EQ(unrelated.get(), aura::Desktop::GetInstance()->active_window());
170 } 170 }
171 171
172 } // namespace test 172 } // namespace test
173 } // namespace aura_shell 173 } // namespace aura_shell
OLDNEW
« no previous file with comments | « ui/aura_shell/modal_container_layout_manager.cc ('k') | ui/aura_shell/shelf_layout_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698