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

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

Issue 2931573003: Fix stability and data racing issues, coalesce more updates for JumpList (Closed)
Patch Set: Remove refcounting for jumplist KeyedService, fix nits. Created 3 years, 6 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 670 matching lines...) Expand 10 before | Expand all | Expand 10 after
681 681
682 std::unique_ptr<ExclusiveAccessBubbleViews> exclusive_access_bubble_; 682 std::unique_ptr<ExclusiveAccessBubbleViews> exclusive_access_bubble_;
683 683
684 std::unique_ptr<NewBackShortcutBubble> new_back_shortcut_bubble_; 684 std::unique_ptr<NewBackShortcutBubble> new_back_shortcut_bubble_;
685 base::TimeTicks last_back_shortcut_press_time_; 685 base::TimeTicks last_back_shortcut_press_time_;
686 686
687 #if defined(OS_WIN) 687 #if defined(OS_WIN)
688 // Helper class to listen for completion of first page load. 688 // Helper class to listen for completion of first page load.
689 std::unique_ptr<LoadCompleteListener> load_complete_listener_; 689 std::unique_ptr<LoadCompleteListener> load_complete_listener_;
690 690
691 // The custom JumpList for Windows 7. 691 // The custom JumpList for Windows 7.
grt (UTC plus 2) 2017/06/12 20:43:38 nit: remove "7" since the jumplist applies to all
chengx 2017/06/12 22:05:30 Done.
692 scoped_refptr<JumpList> jumplist_; 692 JumpList* jumplist_;
grt (UTC plus 2) 2017/06/12 20:43:38 = nullptr;
chengx 2017/06/12 22:05:30 Done.
693 #endif 693 #endif
694 694
695 // The timer used to update frames for the Loading Animation. 695 // The timer used to update frames for the Loading Animation.
696 base::RepeatingTimer loading_animation_timer_; 696 base::RepeatingTimer loading_animation_timer_;
697 697
698 views::UnhandledKeyboardEventHandler unhandled_keyboard_event_handler_; 698 views::UnhandledKeyboardEventHandler unhandled_keyboard_event_handler_;
699 699
700 // If this flag is set then SetFocusToLocationBar() will set focus to the 700 // If this flag is set then SetFocusToLocationBar() will set focus to the
701 // location bar even if the browser window is not active. 701 // location bar even if the browser window is not active.
702 bool force_location_bar_focus_; 702 bool force_location_bar_focus_;
703 703
704 std::unique_ptr<ImmersiveModeController> immersive_mode_controller_; 704 std::unique_ptr<ImmersiveModeController> immersive_mode_controller_;
705 705
706 std::unique_ptr<WebContentsCloseHandler> web_contents_close_handler_; 706 std::unique_ptr<WebContentsCloseHandler> web_contents_close_handler_;
707 707
708 // The class that registers for keyboard shortcuts for extension commands. 708 // The class that registers for keyboard shortcuts for extension commands.
709 std::unique_ptr<ExtensionKeybindingRegistryViews> 709 std::unique_ptr<ExtensionKeybindingRegistryViews>
710 extension_keybinding_registry_; 710 extension_keybinding_registry_;
711 711
712 std::unique_ptr<BrowserWindowHistogramHelper> histogram_helper_; 712 std::unique_ptr<BrowserWindowHistogramHelper> histogram_helper_;
713 713
714 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; 714 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_;
715 715
716 DISALLOW_COPY_AND_ASSIGN(BrowserView); 716 DISALLOW_COPY_AND_ASSIGN(BrowserView);
717 }; 717 };
718 718
719 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ 719 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/views/frame/browser_view.cc » ('j') | chrome/browser/ui/views/frame/browser_view.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698