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 <stddef.h> | 5 #include <stddef.h> |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/macros.h" | 8 #include "base/macros.h" |
9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
10 #include "ui/aura/client/screen_position_client.h" | 10 #include "ui/aura/client/screen_position_client.h" |
(...skipping 669 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
680 | 680 |
681 // Overridden from ui::SimpleMenuModel::Delegate. | 681 // Overridden from ui::SimpleMenuModel::Delegate. |
682 bool IsCommandIdChecked(int command_id) const override { | 682 bool IsCommandIdChecked(int command_id) const override { |
683 NOTREACHED(); | 683 NOTREACHED(); |
684 return false; | 684 return false; |
685 } | 685 } |
686 bool IsCommandIdEnabled(int command_id) const override { | 686 bool IsCommandIdEnabled(int command_id) const override { |
687 NOTREACHED(); | 687 NOTREACHED(); |
688 return false; | 688 return false; |
689 } | 689 } |
690 bool GetAcceleratorForCommandId(int command_id, | |
691 ui::Accelerator* accelerator) const override { | |
692 NOTREACHED(); | |
693 return false; | |
694 } | |
695 void ExecuteCommand(int command_id, int event_flags) override { | 690 void ExecuteCommand(int command_id, int event_flags) override { |
696 NOTREACHED(); | 691 NOTREACHED(); |
697 } | 692 } |
698 | 693 |
699 aura::Window* window_; | 694 aura::Window* window_; |
700 | 695 |
701 // Boundaries of the client view. | 696 // Boundaries of the client view. |
702 gfx::Rect bounds_; | 697 gfx::Rect bounds_; |
703 | 698 |
704 // Cursor position inside the client view. | 699 // Cursor position inside the client view. |
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
868 // Start touch editing; then press a key and ensure it deactivates touch | 863 // Start touch editing; then press a key and ensure it deactivates touch |
869 // selection. | 864 // selection. |
870 StartTouchEditing(); | 865 StartTouchEditing(); |
871 EXPECT_TRUE(GetSelectionController()); | 866 EXPECT_TRUE(GetSelectionController()); |
872 generator.PressKey(ui::VKEY_A, 0); | 867 generator.PressKey(ui::VKEY_A, 0); |
873 RunPendingMessages(); | 868 RunPendingMessages(); |
874 EXPECT_FALSE(GetSelectionController()); | 869 EXPECT_FALSE(GetSelectionController()); |
875 } | 870 } |
876 | 871 |
877 } // namespace views | 872 } // namespace views |
OLD | NEW |