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

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

Issue 7538022: Jumplist Bug (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 9 years, 4 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
(...skipping 697 matching lines...) Expand 10 before | Expand all | Expand 10 after
708 // This object is initialized with the frame window HWND. This 708 // This object is initialized with the frame window HWND. This
709 // object is also passed as a tick handler with the ticker_ object. 709 // object is also passed as a tick handler with the ticker_ object.
710 // It is used to periodically monitor for hung plugin windows 710 // It is used to periodically monitor for hung plugin windows
711 HungWindowDetector hung_window_detector_; 711 HungWindowDetector hung_window_detector_;
712 712
713 // This object is invoked by hung_window_detector_ when it detects a hung 713 // This object is invoked by hung_window_detector_ when it detects a hung
714 // plugin window. 714 // plugin window.
715 HungPluginAction hung_plugin_action_; 715 HungPluginAction hung_plugin_action_;
716 716
717 // The custom JumpList for Windows 7. 717 // The custom JumpList for Windows 7.
718 scoped_ptr<JumpList> jumplist_; 718 scoped_refptr<JumpList> jumplist_;
719 719
720 // The custom AeroPeek manager for Windows 7. 720 // The custom AeroPeek manager for Windows 7.
721 scoped_ptr<AeroPeekManager> aeropeek_manager_; 721 scoped_ptr<AeroPeekManager> aeropeek_manager_;
722 #endif 722 #endif
723 723
724 // The timer used to update frames for the Loading Animation. 724 // The timer used to update frames for the Loading Animation.
725 base::RepeatingTimer<BrowserView> loading_animation_timer_; 725 base::RepeatingTimer<BrowserView> loading_animation_timer_;
726 726
727 UnhandledKeyboardEventHandler unhandled_keyboard_event_handler_; 727 UnhandledKeyboardEventHandler unhandled_keyboard_event_handler_;
728 728
729 NotificationRegistrar registrar_; 729 NotificationRegistrar registrar_;
730 730
731 // Used to measure the loading spinner animation rate. 731 // Used to measure the loading spinner animation rate.
732 base::TimeTicks last_animation_time_; 732 base::TimeTicks last_animation_time_;
733 733
734 DISALLOW_COPY_AND_ASSIGN(BrowserView); 734 DISALLOW_COPY_AND_ASSIGN(BrowserView);
735 }; 735 };
736 736
737 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ 737 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698