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 833 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
844 NavigationType::Type navigation_type); | 844 NavigationType::Type navigation_type); |
845 virtual void ContentRestrictionsChanged(TabContents* source); | 845 virtual void ContentRestrictionsChanged(TabContents* source); |
846 virtual void RendererUnresponsive(TabContents* source); | 846 virtual void RendererUnresponsive(TabContents* source); |
847 virtual void RendererResponsive(TabContents* source); | 847 virtual void RendererResponsive(TabContents* source); |
848 virtual void WorkerCrashed(TabContents* source); | 848 virtual void WorkerCrashed(TabContents* source); |
849 virtual MainFrameCommitDetails* CreateMainFrameCommitDetails( | 849 virtual MainFrameCommitDetails* CreateMainFrameCommitDetails( |
850 TabContents* tab); | 850 TabContents* tab); |
851 virtual void DidNavigateMainFramePostCommit( | 851 virtual void DidNavigateMainFramePostCommit( |
852 TabContents* tab, | 852 TabContents* tab, |
853 const MainFrameCommitDetails& details); | 853 const MainFrameCommitDetails& details); |
| 854 virtual content::JavaScriptDialogCreator* GetJavaScriptDialogCreator( |
| 855 ) OVERRIDE; |
854 | 856 |
855 // Overridden from TabContentsWrapperDelegate: | 857 // Overridden from TabContentsWrapperDelegate: |
856 virtual void OnDidGetApplicationInfo(TabContentsWrapper* source, | 858 virtual void OnDidGetApplicationInfo(TabContentsWrapper* source, |
857 int32 page_id) OVERRIDE; | 859 int32 page_id) OVERRIDE; |
858 virtual void OnInstallApplication( | 860 virtual void OnInstallApplication( |
859 TabContentsWrapper* source, | 861 TabContentsWrapper* source, |
860 const WebApplicationInfo& app_info) OVERRIDE; | 862 const WebApplicationInfo& app_info) OVERRIDE; |
861 | 863 |
862 // Note that the caller is responsible for deleting |old_tab_contents|. | 864 // Note that the caller is responsible for deleting |old_tab_contents|. |
863 virtual void SwapTabContents(TabContentsWrapper* old_tab_contents, | 865 virtual void SwapTabContents(TabContentsWrapper* old_tab_contents, |
(...skipping 371 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1235 // Helper which implements the TabRestoreServiceDelegate interface. | 1237 // Helper which implements the TabRestoreServiceDelegate interface. |
1236 scoped_ptr<BrowserTabRestoreServiceDelegate> tab_restore_service_delegate_; | 1238 scoped_ptr<BrowserTabRestoreServiceDelegate> tab_restore_service_delegate_; |
1237 | 1239 |
1238 scoped_ptr<InstantController> instant_; | 1240 scoped_ptr<InstantController> instant_; |
1239 scoped_ptr<InstantUnloadHandler> instant_unload_handler_; | 1241 scoped_ptr<InstantUnloadHandler> instant_unload_handler_; |
1240 | 1242 |
1241 DISALLOW_COPY_AND_ASSIGN(Browser); | 1243 DISALLOW_COPY_AND_ASSIGN(Browser); |
1242 }; | 1244 }; |
1243 | 1245 |
1244 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 1246 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
OLD | NEW |