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

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

Issue 108413007: Enable the hung plugin detector on Win Aura. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 6 years, 12 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) 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 <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 664 matching lines...) Expand 10 before | Expand all | Expand 10 after
675 // True if we have already been initialized. 675 // True if we have already been initialized.
676 bool initialized_; 676 bool initialized_;
677 677
678 // True when in ProcessFullscreen(). The flag is used to avoid reentrance and 678 // True when in ProcessFullscreen(). The flag is used to avoid reentrance and
679 // to ignore requests to layout while in ProcessFullscreen() to reduce 679 // to ignore requests to layout while in ProcessFullscreen() to reduce
680 // jankiness. 680 // jankiness.
681 bool in_process_fullscreen_; 681 bool in_process_fullscreen_;
682 682
683 scoped_ptr<FullscreenExitBubbleViews> fullscreen_bubble_; 683 scoped_ptr<FullscreenExitBubbleViews> fullscreen_bubble_;
684 684
685 #if defined(OS_WIN) && !defined(USE_AURA) 685 #if defined(OS_WIN)
686 // This object is used to perform periodic actions in a worker 686 // This object is used to perform periodic actions in a worker
687 // thread. It is currently used to monitor hung plugin windows. 687 // thread. It is currently used to monitor hung plugin windows.
688 WorkerThreadTicker ticker_; 688 WorkerThreadTicker ticker_;
689 689
690 // This object is initialized with the frame window HWND. This 690 // This object is initialized with the frame window HWND. This
691 // object is also passed as a tick handler with the ticker_ object. 691 // object is also passed as a tick handler with the ticker_ object.
692 // It is used to periodically monitor for hung plugin windows 692 // It is used to periodically monitor for hung plugin windows
693 HungWindowDetector hung_window_detector_; 693 HungWindowDetector hung_window_detector_;
694 694
695 // This object is invoked by hung_window_detector_ when it detects a hung 695 // This object is invoked by hung_window_detector_ when it detects a hung
(...skipping 24 matching lines...) Expand all
720 scoped_ptr<ScrollEndEffectController> scroll_end_effect_controller_; 720 scoped_ptr<ScrollEndEffectController> scroll_end_effect_controller_;
721 721
722 gfx::ScopedSysColorChangeListener color_change_listener_; 722 gfx::ScopedSysColorChangeListener color_change_listener_;
723 723
724 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; 724 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_;
725 725
726 DISALLOW_COPY_AND_ASSIGN(BrowserView); 726 DISALLOW_COPY_AND_ASSIGN(BrowserView);
727 }; 727 };
728 728
729 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ 729 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/hang_monitor/hung_plugin_action.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