ui/views/controls/menu/menu_controller_unittest.cc - Issue 301243012: Merge 269819 "views: Terminate the nested message-loop correctly..."

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/controls/menu/menu_controller_unittest.cc

Issue 301243012: Merge 269819 "views: Terminate the nested message-loop correctly..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1985/src/

Patch Set: Created 6 years, 6 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

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/controls/menu/menu_controller.h"	5 #include "ui/views/controls/menu/menu_controller.h"

6	6

7 #include "base/run_loop.h"	7 #include "base/run_loop.h"

8 #include "ui/aura/window.h"	8 #include "ui/aura/window.h"

9 #include "ui/events/platform/platform_event_source.h"	9 #include "ui/events/platform/platform_event_source.h"

10 #include "ui/views/test/views_test_base.h"	10 #include "ui/views/test/views_test_base.h"

(...skipping 133 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
144	144

145 TEST_F(MenuControllerTest, Basic) {	145 TEST_F(MenuControllerTest, Basic) {

146 base::MessageLoop::ScopedNestableTaskAllower allow_nested(	146 base::MessageLoop::ScopedNestableTaskAllower allow_nested(

147 base::MessageLoop::current());	147 base::MessageLoop::current());

148 message_loop()->PostTask(	148 message_loop()->PostTask(

149 FROM_HERE,	149 FROM_HERE,

150 base::Bind(&MenuControllerTest::Step1_RunMenu, base::Unretained(this)));	150 base::Bind(&MenuControllerTest::Step1_RunMenu, base::Unretained(this)));

151 }	151 }

152	152

153 } // namespace views	153 } // namespace views

OLD	NEW

« no previous file with comments | « ui/views/controls/menu/menu_controller.cc ('k') | ui/views/controls/menu/menu_event_dispatcher_linux.cc » ('j') | no next file with comments »