ui/views/widget/desktop_aura/desktop_focus_rules_unittest.cc - Issue 190633014: Merge 255714 "Fixes bug that resulted in status bubble getting h..."

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 190633014: Merge 255714 "Fixes bug that resulted in status bubble getting h..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1847/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

« no previous file with comments | « ui/views/widget/desktop_aura/desktop_focus_rules.cc ('k') | no next file » | no next file with comments »

OLD	NEW
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"

(...skipping 38 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
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

OLD	NEW