OLD | NEW |
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_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 789 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
800 virtual void ShowContentSettingsWindow(ContentSettingsType content_type); | 800 virtual void ShowContentSettingsWindow(ContentSettingsType content_type); |
801 virtual void ShowCollectedCookiesDialog(TabContents* tab_contents); | 801 virtual void ShowCollectedCookiesDialog(TabContents* tab_contents); |
802 virtual bool ShouldAddNavigationToHistory( | 802 virtual bool ShouldAddNavigationToHistory( |
803 const history::HistoryAddPageArgs& add_page_args, | 803 const history::HistoryAddPageArgs& add_page_args, |
804 NavigationType::Type navigation_type); | 804 NavigationType::Type navigation_type); |
805 virtual void OnDidGetApplicationInfo(TabContents* tab_contents, | 805 virtual void OnDidGetApplicationInfo(TabContents* tab_contents, |
806 int32 page_id); | 806 int32 page_id); |
807 virtual void OnInstallApplication(TabContents* tab_contents, | 807 virtual void OnInstallApplication(TabContents* tab_contents, |
808 const WebApplicationInfo& app_info); | 808 const WebApplicationInfo& app_info); |
809 virtual void ContentRestrictionsChanged(TabContents* source); | 809 virtual void ContentRestrictionsChanged(TabContents* source); |
| 810 virtual void WorkerCrashed(); |
810 | 811 |
811 // Overridden from TabContentsWrapperDelegate: | 812 // Overridden from TabContentsWrapperDelegate: |
812 virtual void URLStarredChanged(TabContentsWrapper* source, | 813 virtual void URLStarredChanged(TabContentsWrapper* source, |
813 bool starred) OVERRIDE; | 814 bool starred) OVERRIDE; |
814 // Overridden from SearchEngineTabHelperDelegate: | 815 // Overridden from SearchEngineTabHelperDelegate: |
815 virtual void ConfirmSetDefaultSearchProvider( | 816 virtual void ConfirmSetDefaultSearchProvider( |
816 TabContents* tab_contents, | 817 TabContents* tab_contents, |
817 TemplateURL* template_url, | 818 TemplateURL* template_url, |
818 TemplateURLModel* template_url_model) OVERRIDE; | 819 TemplateURLModel* template_url_model) OVERRIDE; |
819 virtual void ConfirmAddSearchProvider(const TemplateURL* template_url, | 820 virtual void ConfirmAddSearchProvider(const TemplateURL* template_url, |
(...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1141 // and we install ourselves as an observer. | 1142 // and we install ourselves as an observer. |
1142 TabRestoreService* tab_restore_service_; | 1143 TabRestoreService* tab_restore_service_; |
1143 | 1144 |
1144 scoped_ptr<InstantController> instant_; | 1145 scoped_ptr<InstantController> instant_; |
1145 scoped_ptr<InstantUnloadHandler> instant_unload_handler_; | 1146 scoped_ptr<InstantUnloadHandler> instant_unload_handler_; |
1146 | 1147 |
1147 DISALLOW_COPY_AND_ASSIGN(Browser); | 1148 DISALLOW_COPY_AND_ASSIGN(Browser); |
1148 }; | 1149 }; |
1149 | 1150 |
1150 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 1151 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
OLD | NEW |