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

Side by Side Diff: ui/views/widget/desktop_aura/desktop_focus_rules_unittest.cc

Issue 194843004: Move files from ui/views/corewm to ui/wm/core (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 9 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/views/widget/desktop_aura/desktop_focus_rules.h" 5 #include "ui/views/widget/desktop_aura/desktop_focus_rules.h"
6 6
7 #include "ui/aura/client/focus_client.h" 7 #include "ui/aura/client/focus_client.h"
8 #include "ui/aura/test/test_window_delegate.h" 8 #include "ui/aura/test/test_window_delegate.h"
9 #include "ui/aura/window.h" 9 #include "ui/aura/window.h"
10 #include "ui/aura/window_event_dispatcher.h" 10 #include "ui/aura/window_event_dispatcher.h"
11 #include "ui/aura/window_layer_type.h" 11 #include "ui/aura/window_layer_type.h"
12 #include "ui/views/corewm/window_util.h"
13 #include "ui/views/test/views_test_base.h" 12 #include "ui/views/test/views_test_base.h"
14 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" 13 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
15 #include "ui/views/widget/widget.h" 14 #include "ui/views/widget/widget.h"
15 #include "ui/wm/core/window_util.h"
16 16
17 namespace views { 17 namespace views {
18 18
19 namespace { 19 namespace {
20 20
21 scoped_ptr<Widget> CreateDesktopWidget() { 21 scoped_ptr<Widget> CreateDesktopWidget() {
22 scoped_ptr<Widget> widget(new Widget); 22 scoped_ptr<Widget> widget(new Widget);
23 Widget::InitParams params = Widget::InitParams( 23 Widget::InitParams params = Widget::InitParams(
24 Widget::InitParams::TYPE_WINDOW); 24 Widget::InitParams::TYPE_WINDOW);
25 params.bounds = gfx::Rect(0, 0, 200, 200); 25 params.bounds = gfx::Rect(0, 0, 200, 200);
(...skipping 23 matching lines...) Expand all
49 aura::client::GetFocusClient(w2->GetNativeView())->FocusWindow(w2_child); 49 aura::client::GetFocusClient(w2->GetNativeView())->FocusWindow(w2_child);
50 aura::Window* focused = 50 aura::Window* focused =
51 aura::client::GetFocusClient(w2->GetNativeView())->GetFocusedWindow(); 51 aura::client::GetFocusClient(w2->GetNativeView())->GetFocusedWindow();
52 EXPECT_TRUE((focused == NULL) || w2->GetNativeView()->Contains(focused)); 52 EXPECT_TRUE((focused == NULL) || w2->GetNativeView()->Contains(focused));
53 views::corewm::RemoveTransientChild(w1->GetNativeView(), w2_child); 53 views::corewm::RemoveTransientChild(w1->GetNativeView(), w2_child);
54 w1.reset(); 54 w1.reset();
55 w2.reset(); 55 w2.reset();
56 } 56 }
57 57
58 } // namespace views 58 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/widget/desktop_aura/desktop_focus_rules.h ('k') | ui/views/widget/desktop_aura/desktop_native_cursor_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698