OLD | NEW |
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 1067 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1078 | 1078 |
1079 virtual void FindReply(content::WebContents* tab, | 1079 virtual void FindReply(content::WebContents* tab, |
1080 int request_id, | 1080 int request_id, |
1081 int number_of_matches, | 1081 int number_of_matches, |
1082 const gfx::Rect& selection_rect, | 1082 const gfx::Rect& selection_rect, |
1083 int active_match_ordinal, | 1083 int active_match_ordinal, |
1084 bool final_update) OVERRIDE; | 1084 bool final_update) OVERRIDE; |
1085 | 1085 |
1086 virtual void CrashedPlugin(content::WebContents* tab, | 1086 virtual void CrashedPlugin(content::WebContents* tab, |
1087 const FilePath& plugin_path) OVERRIDE; | 1087 const FilePath& plugin_path) OVERRIDE; |
| 1088 virtual void PluginHungStatusChanged(content::WebContents* tab, |
| 1089 int plugin_child_id, |
| 1090 const FilePath& plugin_path, |
| 1091 bool is_hung) OVERRIDE; |
1088 | 1092 |
1089 virtual void RequestToLockMouse(content::WebContents* tab) OVERRIDE; | 1093 virtual void RequestToLockMouse(content::WebContents* tab) OVERRIDE; |
1090 virtual void LostMouseLock() OVERRIDE; | 1094 virtual void LostMouseLock() OVERRIDE; |
1091 | 1095 |
1092 // Overridden from CoreTabHelperDelegate: | 1096 // Overridden from CoreTabHelperDelegate: |
1093 // Note that the caller is responsible for deleting |old_tab_contents|. | 1097 // Note that the caller is responsible for deleting |old_tab_contents|. |
1094 virtual void SwapTabContents(TabContentsWrapper* old_tab_contents, | 1098 virtual void SwapTabContents(TabContentsWrapper* old_tab_contents, |
1095 TabContentsWrapper* new_tab_contents) OVERRIDE; | 1099 TabContentsWrapper* new_tab_contents) OVERRIDE; |
1096 | 1100 |
1097 // Overridden from SearchEngineTabHelperDelegate: | 1101 // Overridden from SearchEngineTabHelperDelegate: |
(...skipping 412 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1510 bool window_has_shown_; | 1514 bool window_has_shown_; |
1511 | 1515 |
1512 // Currently open color chooser. Non-NULL after OpenColorChooser is called and | 1516 // Currently open color chooser. Non-NULL after OpenColorChooser is called and |
1513 // before DidEndColorChooser is called. | 1517 // before DidEndColorChooser is called. |
1514 scoped_ptr<content::ColorChooser> color_chooser_; | 1518 scoped_ptr<content::ColorChooser> color_chooser_; |
1515 | 1519 |
1516 DISALLOW_COPY_AND_ASSIGN(Browser); | 1520 DISALLOW_COPY_AND_ASSIGN(Browser); |
1517 }; | 1521 }; |
1518 | 1522 |
1519 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 1523 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
OLD | NEW |