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

Side by Side Diff: content/public/test/browser_test_utils.cc

Issue 1908683002: Replace OS_LEFT/RIGHT with META_LEFT/RIGHT (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 (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 "content/public/test/browser_test_utils.h" 5 #include "content/public/test/browser_test_utils.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 577 matching lines...) Expand 10 before | Expand all | Expand 10 after
588 InjectRawKeyEvent( 588 InjectRawKeyEvent(
589 web_contents, blink::WebInputEvent::RawKeyDown, ui::VKEY_MENU, 589 web_contents, blink::WebInputEvent::RawKeyDown, ui::VKEY_MENU,
590 ui::KeycodeConverter::DomCodeToNativeKeycode(ui::DomCode::ALT_LEFT), 590 ui::KeycodeConverter::DomCodeToNativeKeycode(ui::DomCode::ALT_LEFT),
591 modifiers); 591 modifiers);
592 } 592 }
593 593
594 if (command) { 594 if (command) {
595 modifiers |= blink::WebInputEvent::MetaKey; 595 modifiers |= blink::WebInputEvent::MetaKey;
596 InjectRawKeyEvent( 596 InjectRawKeyEvent(
597 web_contents, blink::WebInputEvent::RawKeyDown, ui::VKEY_COMMAND, 597 web_contents, blink::WebInputEvent::RawKeyDown, ui::VKEY_COMMAND,
598 ui::KeycodeConverter::DomCodeToNativeKeycode(ui::DomCode::OS_LEFT), 598 ui::KeycodeConverter::DomCodeToNativeKeycode(ui::DomCode::META_LEFT),
599 modifiers); 599 modifiers);
600 } 600 }
601 InjectRawKeyEvent(web_contents, blink::WebInputEvent::RawKeyDown, key_code, 601 InjectRawKeyEvent(web_contents, blink::WebInputEvent::RawKeyDown, key_code,
602 native_key_code, modifiers); 602 native_key_code, modifiers);
603 603
604 InjectRawKeyEvent(web_contents, blink::WebInputEvent::Char, key_code, 604 InjectRawKeyEvent(web_contents, blink::WebInputEvent::Char, key_code,
605 native_key_code, modifiers); 605 native_key_code, modifiers);
606 606
607 InjectRawKeyEvent(web_contents, blink::WebInputEvent::KeyUp, key_code, 607 InjectRawKeyEvent(web_contents, blink::WebInputEvent::KeyUp, key_code,
608 native_key_code, modifiers); 608 native_key_code, modifiers);
(...skipping 20 matching lines...) Expand all
629 InjectRawKeyEvent( 629 InjectRawKeyEvent(
630 web_contents, blink::WebInputEvent::KeyUp, ui::VKEY_MENU, 630 web_contents, blink::WebInputEvent::KeyUp, ui::VKEY_MENU,
631 ui::KeycodeConverter::DomCodeToNativeKeycode(ui::DomCode::ALT_LEFT), 631 ui::KeycodeConverter::DomCodeToNativeKeycode(ui::DomCode::ALT_LEFT),
632 modifiers); 632 modifiers);
633 } 633 }
634 634
635 if (command) { 635 if (command) {
636 modifiers &= ~blink::WebInputEvent::MetaKey; 636 modifiers &= ~blink::WebInputEvent::MetaKey;
637 InjectRawKeyEvent( 637 InjectRawKeyEvent(
638 web_contents, blink::WebInputEvent::KeyUp, ui::VKEY_COMMAND, 638 web_contents, blink::WebInputEvent::KeyUp, ui::VKEY_COMMAND,
639 ui::KeycodeConverter::DomCodeToNativeKeycode(ui::DomCode::OS_LEFT), 639 ui::KeycodeConverter::DomCodeToNativeKeycode(ui::DomCode::META_LEFT),
640 modifiers); 640 modifiers);
641 } 641 }
642 642
643 ASSERT_EQ(modifiers, 0); 643 ASSERT_EQ(modifiers, 0);
644 } 644 }
645 645
646 ToRenderFrameHost::ToRenderFrameHost(WebContents* web_contents) 646 ToRenderFrameHost::ToRenderFrameHost(WebContents* web_contents)
647 : render_frame_host_(web_contents->GetMainFrame()) { 647 : render_frame_host_(web_contents->GetMainFrame()) {
648 } 648 }
649 649
(...skipping 579 matching lines...) Expand 10 before | Expand all | Expand 10 after
1229 DCHECK_CURRENTLY_ON(BrowserThread::UI); 1229 DCHECK_CURRENTLY_ON(BrowserThread::UI);
1230 if (ack_result_ != INPUT_EVENT_ACK_STATE_UNKNOWN) 1230 if (ack_result_ != INPUT_EVENT_ACK_STATE_UNKNOWN)
1231 return ack_result_; 1231 return ack_result_;
1232 base::RunLoop run_loop; 1232 base::RunLoop run_loop;
1233 base::AutoReset<base::Closure> reset_quit(&quit_, run_loop.QuitClosure()); 1233 base::AutoReset<base::Closure> reset_quit(&quit_, run_loop.QuitClosure());
1234 run_loop.Run(); 1234 run_loop.Run();
1235 return ack_result_; 1235 return ack_result_;
1236 } 1236 }
1237 1237
1238 } // namespace content 1238 } // namespace content
OLDNEW
« no previous file with comments | « chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc ('k') | remoting/client/normalizing_input_filter_cros.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698