trunk/src/ash/accelerators/nested_dispatcher_controller_unittest.cc - Issue 300093002: Revert 272740 "Refactor and move ash independent accelerator han..."

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: trunk/src/ash/accelerators/nested_dispatcher_controller_unittest.cc

Issue 300093002: Revert 272740 "Refactor and move ash independent accelerator han..." (Closed) Base URL: svn://svn.chromium.org/chrome/

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

« no previous file with comments | « trunk/src/ash/accelerators/nested_dispatcher_controller.cc ('k') | trunk/src/ash/ash.gyp » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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 "ash/accelerators/accelerator_controller.h"	5 #include "ash/accelerators/accelerator_controller.h"

6 #include "ash/session/session_state_delegate.h"	6 #include "ash/session/session_state_delegate.h"

7 #include "ash/shell.h"	7 #include "ash/shell.h"

8 #include "ash/shell_window_ids.h"	8 #include "ash/shell_window_ids.h"

9 #include "ash/test/ash_test_base.h"	9 #include "ash/test/ash_test_base.h"

10 #include "base/bind.h"	10 #include "base/bind.h"

(...skipping 131 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
142 scoped_ptr<ui::ScopedEventDispatcher> override_dispatcher =	142 scoped_ptr<ui::ScopedEventDispatcher> override_dispatcher =

143 ui::PlatformEventSource::GetInstance()->OverrideDispatcher(	143 ui::PlatformEventSource::GetInstance()->OverrideDispatcher(

144 &inner_dispatcher);	144 &inner_dispatcher);

145 aura::client::GetDispatcherClient(root_window)->RunWithDispatcher(NULL);	145 aura::client::GetDispatcherClient(root_window)->RunWithDispatcher(NULL);

146 EXPECT_EQ(0, inner_dispatcher.num_key_events_dispatched());	146 EXPECT_EQ(0, inner_dispatcher.num_key_events_dispatched());

147 EXPECT_EQ(1, target.accelerator_pressed_count());	147 EXPECT_EQ(1, target.accelerator_pressed_count());

148 }	148 }

149	149

150 } // namespace test	150 } // namespace test

151 } // namespace ash	151 } // namespace ash

OLD	NEW