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

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

Issue 186733011: Fixes bug that resulted in status bubble getting hidden (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comment 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
« no previous file with comments | « ui/views/widget/desktop_aura/desktop_focus_rules.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
(Empty)
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
3 // found in the LICENSE file.
4
5 #include "ui/views/widget/desktop_aura/desktop_focus_rules.h"
6
7 #include "ui/aura/client/focus_client.h"
8 #include "ui/aura/test/test_window_delegate.h"
9 #include "ui/aura/window.h"
10 #include "ui/aura/window_event_dispatcher.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"
14 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
15 #include "ui/views/widget/widget.h"
16
17 namespace views {
18
19 namespace {
20
21 scoped_ptr<Widget> CreateDesktopWidget() {
22 scoped_ptr<Widget> widget(new Widget);
23 Widget::InitParams params = Widget::InitParams(
24 Widget::InitParams::TYPE_WINDOW);
25 params.bounds = gfx::Rect(0, 0, 200, 200);
26 params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
27 params.native_widget = new DesktopNativeWidgetAura(widget.get());
28 widget->Init(params);
29 return widget.Pass();
30 }
31
32 } // namespace
33
34 typedef ViewsTestBase DesktopFocusRulesTest;
35
36 // Verifies we don't attempt to activate a window in another widget.
37 TEST_F(DesktopFocusRulesTest, DontFocusWindowsInOtherHierarchies) {
38 // Two widgets (each with a DesktopNativeWidgetAura). |w2| has a child Window
39 // |w2_child| that is not focusable. |w2_child|'s has a transient parent in
40 // |w1|.
41 scoped_ptr<views::Widget> w1(CreateDesktopWidget());
42 scoped_ptr<views::Widget> w2(CreateDesktopWidget());
43 aura::test::TestWindowDelegate w2_child_delegate;
44 w2_child_delegate.set_can_focus(false);
45 aura::Window* w2_child = new aura::Window(&w2_child_delegate);
46 w2_child->Init(aura::WINDOW_LAYER_SOLID_COLOR);
47 w2->GetNativeView()->AddChild(w2_child);
48 views::corewm::AddTransientChild(w1->GetNativeView(), w2_child);
49 aura::client::GetFocusClient(w2->GetNativeView())->FocusWindow(w2_child);
50 aura::Window* focused =
51 aura::client::GetFocusClient(w2->GetNativeView())->GetFocusedWindow();
52 EXPECT_TRUE((focused == NULL) || w2->GetNativeView()->Contains(focused));
53 views::corewm::RemoveTransientChild(w1->GetNativeView(), w2_child);
54 w1.reset();
55 w2.reset();
56 }
57
58 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/widget/desktop_aura/desktop_focus_rules.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698