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

Side by Side Diff: ash/accelerators/nested_dispatcher_controller_unittest.cc

Issue 10143001: Work in progress: Adds MessagePumpDispatcher::ShouldExit(). This is used to handle the (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 8 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 | « ash/accelerators/accelerator_dispatcher.cc ('k') | base/message_pump_dispatcher.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/shell.h" 6 #include "ash/shell.h"
7 #include "ash/shell_delegate.h" 7 #include "ash/shell_delegate.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 22 matching lines...) Expand all
33 } 33 }
34 34
35 int num_key_events_dispatched() { return num_key_events_dispatched_; } 35 int num_key_events_dispatched() { return num_key_events_dispatched_; }
36 36
37 #if defined(OS_WIN) || defined(USE_X11) 37 #if defined(OS_WIN) || defined(USE_X11)
38 virtual bool Dispatch(const base::NativeEvent& event) OVERRIDE { 38 virtual bool Dispatch(const base::NativeEvent& event) OVERRIDE {
39 if (ui::EventTypeFromNative(event) == ui::ET_KEY_RELEASED) 39 if (ui::EventTypeFromNative(event) == ui::ET_KEY_RELEASED)
40 num_key_events_dispatched_++; 40 num_key_events_dispatched_++;
41 return !ui::IsNoopEvent(event); 41 return !ui::IsNoopEvent(event);
42 } 42 }
43 virtual bool ShouldExit() OVERRIDE {
44 return false;
45 }
43 #endif // defined(OS_WIN) || defined(USE_X11) 46 #endif // defined(OS_WIN) || defined(USE_X11)
44 47
45 private: 48 private:
46 int num_key_events_dispatched_; 49 int num_key_events_dispatched_;
47 }; 50 };
48 51
49 class TestTarget : public ui::AcceleratorTarget { 52 class TestTarget : public ui::AcceleratorTarget {
50 public: 53 public:
51 TestTarget() : accelerator_pressed_count_(0) { 54 TestTarget() : accelerator_pressed_count_(0) {
52 } 55 }
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 aura::client::GetDispatcherClient(root_window)->RunWithDispatcher( 164 aura::client::GetDispatcherClient(root_window)->RunWithDispatcher(
162 &inner_dispatcher, 165 &inner_dispatcher,
163 root_window, 166 root_window,
164 true /* nestable_tasks_allowed */); 167 true /* nestable_tasks_allowed */);
165 EXPECT_EQ(0, inner_dispatcher.num_key_events_dispatched()); 168 EXPECT_EQ(0, inner_dispatcher.num_key_events_dispatched());
166 EXPECT_EQ(1, target.accelerator_pressed_count()); 169 EXPECT_EQ(1, target.accelerator_pressed_count());
167 } 170 }
168 171
169 } // namespace test 172 } // namespace test
170 } // namespace ash 173 } // namespace ash
OLDNEW
« no previous file with comments | « ash/accelerators/accelerator_dispatcher.cc ('k') | base/message_pump_dispatcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698