trunk/src/ash/accelerators/nested_dispatcher_controller.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.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, 7 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:

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/nested_dispatcher_controller.h"	5 #include "ash/accelerators/nested_dispatcher_controller.h"

6	6

7 #include "ash/accelerators/accelerator_dispatcher.h"	7 #include "ash/accelerators/accelerator_dispatcher.h"

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

9 #include "base/auto_reset.h"	9 #include "base/auto_reset.h"

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

(...skipping 24 matching lines...) Expand all Loading...
35 accelerator_dispatcher_ = old_accelerator_dispatcher.Pass();	35 accelerator_dispatcher_ = old_accelerator_dispatcher.Pass();

36 }	36 }

37	37

38 void NestedDispatcherController::QuitNestedMessageLoop() {	38 void NestedDispatcherController::QuitNestedMessageLoop() {

39 CHECK(!quit_closure_.is_null());	39 CHECK(!quit_closure_.is_null());

40 quit_closure_.Run();	40 quit_closure_.Run();

41 accelerator_dispatcher_.reset();	41 accelerator_dispatcher_.reset();

42 }	42 }

43	43

44 } // namespace ash	44 } // namespace ash

OLD	NEW