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

Side by Side Diff: chrome/browser/chromeos/events/keyboard_driven_event_rewriter.cc

Issue 1870793002: Convert //chrome/browser/chromeos from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "chrome/browser/chromeos/events/keyboard_driven_event_rewriter.h" 5 #include "chrome/browser/chromeos/events/keyboard_driven_event_rewriter.h"
6 6
7 #include "chrome/browser/chromeos/events/event_rewriter.h" 7 #include "chrome/browser/chromeos/events/event_rewriter.h"
8 #include "chrome/browser/chromeos/system/input_device_settings.h" 8 #include "chrome/browser/chromeos/system/input_device_settings.h"
9 #include "components/user_manager/user_manager.h" 9 #include "components/user_manager/user_manager.h"
10 #include "ui/events/event.h" 10 #include "ui/events/event.h"
(...skipping 20 matching lines...) Expand all
31 } // namespace 31 } // namespace
32 32
33 KeyboardDrivenEventRewriter::KeyboardDrivenEventRewriter() { 33 KeyboardDrivenEventRewriter::KeyboardDrivenEventRewriter() {
34 } 34 }
35 35
36 KeyboardDrivenEventRewriter::~KeyboardDrivenEventRewriter() { 36 KeyboardDrivenEventRewriter::~KeyboardDrivenEventRewriter() {
37 } 37 }
38 38
39 ui::EventRewriteStatus KeyboardDrivenEventRewriter::RewriteForTesting( 39 ui::EventRewriteStatus KeyboardDrivenEventRewriter::RewriteForTesting(
40 const ui::Event& event, 40 const ui::Event& event,
41 scoped_ptr<ui::Event>* rewritten_event) { 41 std::unique_ptr<ui::Event>* rewritten_event) {
42 return Rewrite(event, rewritten_event); 42 return Rewrite(event, rewritten_event);
43 } 43 }
44 44
45 ui::EventRewriteStatus KeyboardDrivenEventRewriter::RewriteEvent( 45 ui::EventRewriteStatus KeyboardDrivenEventRewriter::RewriteEvent(
46 const ui::Event& event, 46 const ui::Event& event,
47 scoped_ptr<ui::Event>* rewritten_event) { 47 std::unique_ptr<ui::Event>* rewritten_event) {
48 if (!ShouldStripModifiersForArrowKeysAndEnter()) 48 if (!ShouldStripModifiersForArrowKeysAndEnter())
49 return ui::EVENT_REWRITE_CONTINUE; 49 return ui::EVENT_REWRITE_CONTINUE;
50 50
51 return Rewrite(event, rewritten_event); 51 return Rewrite(event, rewritten_event);
52 } 52 }
53 53
54 ui::EventRewriteStatus KeyboardDrivenEventRewriter::NextDispatchEvent( 54 ui::EventRewriteStatus KeyboardDrivenEventRewriter::NextDispatchEvent(
55 const ui::Event& last_event, 55 const ui::Event& last_event,
56 scoped_ptr<ui::Event>* new_event) { 56 std::unique_ptr<ui::Event>* new_event) {
57 NOTREACHED(); 57 NOTREACHED();
58 return ui::EVENT_REWRITE_CONTINUE; 58 return ui::EVENT_REWRITE_CONTINUE;
59 } 59 }
60 60
61 ui::EventRewriteStatus KeyboardDrivenEventRewriter::Rewrite( 61 ui::EventRewriteStatus KeyboardDrivenEventRewriter::Rewrite(
62 const ui::Event& event, 62 const ui::Event& event,
63 scoped_ptr<ui::Event>* rewritten_event) { 63 std::unique_ptr<ui::Event>* rewritten_event) {
64 int flags = event.flags(); 64 int flags = event.flags();
65 if ((flags & kModifierMask) != kModifierMask) 65 if ((flags & kModifierMask) != kModifierMask)
66 return ui::EVENT_REWRITE_CONTINUE; 66 return ui::EVENT_REWRITE_CONTINUE;
67 67
68 DCHECK(event.type() == ui::ET_KEY_PRESSED || 68 DCHECK(event.type() == ui::ET_KEY_PRESSED ||
69 event.type() == ui::ET_KEY_RELEASED) 69 event.type() == ui::ET_KEY_RELEASED)
70 << "Unexpected event type " << event.type(); 70 << "Unexpected event type " << event.type();
71 const ui::KeyEvent& key_event = static_cast<const ui::KeyEvent&>(event); 71 const ui::KeyEvent& key_event = static_cast<const ui::KeyEvent&>(event);
72 ui::KeyboardCode key_code = key_event.key_code(); 72 ui::KeyboardCode key_code = key_event.key_code();
73 73
74 if (key_code != ui::VKEY_LEFT && key_code != ui::VKEY_RIGHT && 74 if (key_code != ui::VKEY_LEFT && key_code != ui::VKEY_RIGHT &&
75 key_code != ui::VKEY_UP && key_code != ui::VKEY_DOWN && 75 key_code != ui::VKEY_UP && key_code != ui::VKEY_DOWN &&
76 key_code != ui::VKEY_RETURN && key_code != ui::VKEY_F6) { 76 key_code != ui::VKEY_RETURN && key_code != ui::VKEY_F6) {
77 return ui::EVENT_REWRITE_CONTINUE; 77 return ui::EVENT_REWRITE_CONTINUE;
78 } 78 }
79 79
80 chromeos::EventRewriter::MutableKeyState state = { 80 chromeos::EventRewriter::MutableKeyState state = {
81 flags & ~(ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN), 81 flags & ~(ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN),
82 key_event.code(), 82 key_event.code(),
83 key_event.GetDomKey(), 83 key_event.GetDomKey(),
84 key_event.key_code()}; 84 key_event.key_code()};
85 85
86 chromeos::EventRewriter::BuildRewrittenKeyEvent(key_event, state, 86 chromeos::EventRewriter::BuildRewrittenKeyEvent(key_event, state,
87 rewritten_event); 87 rewritten_event);
88 return ui::EVENT_REWRITE_REWRITTEN; 88 return ui::EVENT_REWRITE_REWRITTEN;
89 } 89 }
90 90
91 } // namespace chromeos 91 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698