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

Side by Side Diff: chrome/browser/ui/browser.h

Issue 10014013: Add a hang monitor for Pepper plugins (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Review comments Created 8 years, 8 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_BROWSER_H_ 5 #ifndef CHROME_BROWSER_UI_BROWSER_H_
6 #define CHROME_BROWSER_UI_BROWSER_H_ 6 #define CHROME_BROWSER_UI_BROWSER_H_
7 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 1068 matching lines...) Expand 10 before | Expand all | Expand 10 after
1079 1079
1080 virtual void FindReply(content::WebContents* tab, 1080 virtual void FindReply(content::WebContents* tab,
1081 int request_id, 1081 int request_id,
1082 int number_of_matches, 1082 int number_of_matches,
1083 const gfx::Rect& selection_rect, 1083 const gfx::Rect& selection_rect,
1084 int active_match_ordinal, 1084 int active_match_ordinal,
1085 bool final_update) OVERRIDE; 1085 bool final_update) OVERRIDE;
1086 1086
1087 virtual void CrashedPlugin(content::WebContents* tab, 1087 virtual void CrashedPlugin(content::WebContents* tab,
1088 const FilePath& plugin_path) OVERRIDE; 1088 const FilePath& plugin_path) OVERRIDE;
1089 virtual void PluginHungStatusChanged(content::WebContents* tab,
1090 int plugin_child_id,
1091 const FilePath& plugin_path,
1092 bool is_hung) OVERRIDE;
1089 1093
1090 virtual void RequestToLockMouse(content::WebContents* tab) OVERRIDE; 1094 virtual void RequestToLockMouse(content::WebContents* tab) OVERRIDE;
1091 virtual void LostMouseLock() OVERRIDE; 1095 virtual void LostMouseLock() OVERRIDE;
1092 1096
1093 // Overridden from CoreTabHelperDelegate: 1097 // Overridden from CoreTabHelperDelegate:
1094 // Note that the caller is responsible for deleting |old_tab_contents|. 1098 // Note that the caller is responsible for deleting |old_tab_contents|.
1095 virtual void SwapTabContents(TabContentsWrapper* old_tab_contents, 1099 virtual void SwapTabContents(TabContentsWrapper* old_tab_contents,
1096 TabContentsWrapper* new_tab_contents) OVERRIDE; 1100 TabContentsWrapper* new_tab_contents) OVERRIDE;
1097 1101
1098 // Overridden from SearchEngineTabHelperDelegate: 1102 // Overridden from SearchEngineTabHelperDelegate:
(...skipping 412 matching lines...) Expand 10 before | Expand all | Expand 10 after
1511 bool window_has_shown_; 1515 bool window_has_shown_;
1512 1516
1513 // Currently open color chooser. Non-NULL after OpenColorChooser is called and 1517 // Currently open color chooser. Non-NULL after OpenColorChooser is called and
1514 // before DidEndColorChooser is called. 1518 // before DidEndColorChooser is called.
1515 scoped_ptr<content::ColorChooser> color_chooser_; 1519 scoped_ptr<content::ColorChooser> color_chooser_;
1516 1520
1517 DISALLOW_COPY_AND_ASSIGN(Browser); 1521 DISALLOW_COPY_AND_ASSIGN(Browser);
1518 }; 1522 };
1519 1523
1520 #endif // CHROME_BROWSER_UI_BROWSER_H_ 1524 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698