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

Side by Side Diff: chrome/browser/ui/views/frame/browser_view.h

Issue 2128243003: Make most browser accelerators not repeat. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: use set and fix tests Created 4 years, 3 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 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
7 7
8 #include <map> 8 #include <map>
9 #include <memory> 9 #include <memory>
10 #include <string> 10 #include <string>
(...skipping 639 matching lines...) Expand 10 before | Expand all | Expand 10 after
650 views::View* contents_container_; 650 views::View* contents_container_;
651 651
652 // Tracks and stores the last focused view which is not the 652 // Tracks and stores the last focused view which is not the
653 // devtools_web_view_ or any of its children. Used to restore focus once 653 // devtools_web_view_ or any of its children. Used to restore focus once
654 // the devtools_web_view_ is hidden. 654 // the devtools_web_view_ is hidden.
655 std::unique_ptr<views::ExternalFocusTracker> devtools_focus_tracker_; 655 std::unique_ptr<views::ExternalFocusTracker> devtools_focus_tracker_;
656 656
657 // The Status information bubble that appears at the bottom of the window. 657 // The Status information bubble that appears at the bottom of the window.
658 std::unique_ptr<StatusBubbleViews> status_bubble_; 658 std::unique_ptr<StatusBubbleViews> status_bubble_;
659 659
660 // A mapping between accelerators and commands. 660 // A mapping between accelerators and command IDs.
661 std::map<ui::Accelerator, int> accelerator_table_; 661 std::map<ui::Accelerator, int> accelerator_table_;
662 662
663 // IDs of commands that should be executed in response to repeated
664 // accelerators (i.e. generated by holding keys down). Repeated accelerators
665 // are ignored otherwise.
666 std::set<int> repeatable_command_ids_;
sky 2016/09/01 19:31:06 How often do we trigger accelerators, especially o
Daniel Erat 2016/09/01 19:47:31 the local copy was initially due to mirroring the
667
663 // True if we have already been initialized. 668 // True if we have already been initialized.
664 bool initialized_; 669 bool initialized_;
665 670
666 // True if we're currently handling a theme change (i.e. inside 671 // True if we're currently handling a theme change (i.e. inside
667 // OnThemeChanged()). 672 // OnThemeChanged()).
668 bool handling_theme_changed_; 673 bool handling_theme_changed_;
669 674
670 // True when in ProcessFullscreen(). The flag is used to avoid reentrance and 675 // True when in ProcessFullscreen(). The flag is used to avoid reentrance and
671 // to ignore requests to layout while in ProcessFullscreen() to reduce 676 // to ignore requests to layout while in ProcessFullscreen() to reduce
672 // jankiness. 677 // jankiness.
(...skipping 30 matching lines...) Expand all
703 // The class that registers for keyboard shortcuts for extension commands. 708 // The class that registers for keyboard shortcuts for extension commands.
704 std::unique_ptr<ExtensionKeybindingRegistryViews> 709 std::unique_ptr<ExtensionKeybindingRegistryViews>
705 extension_keybinding_registry_; 710 extension_keybinding_registry_;
706 711
707 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; 712 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_;
708 713
709 DISALLOW_COPY_AND_ASSIGN(BrowserView); 714 DISALLOW_COPY_AND_ASSIGN(BrowserView);
710 }; 715 };
711 716
712 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ 717 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/accelerator_table.cc ('k') | chrome/browser/ui/views/frame/browser_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698