| 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 878 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 889 const history::HistoryAddPageArgs& add_page_args, | 889 const history::HistoryAddPageArgs& add_page_args, |
| 890 NavigationType::Type navigation_type) OVERRIDE; | 890 NavigationType::Type navigation_type) OVERRIDE; |
| 891 virtual void ContentRestrictionsChanged(TabContents* source) OVERRIDE; | 891 virtual void ContentRestrictionsChanged(TabContents* source) OVERRIDE; |
| 892 virtual void RendererUnresponsive(TabContents* source) OVERRIDE; | 892 virtual void RendererUnresponsive(TabContents* source) OVERRIDE; |
| 893 virtual void RendererResponsive(TabContents* source) OVERRIDE; | 893 virtual void RendererResponsive(TabContents* source) OVERRIDE; |
| 894 virtual void WorkerCrashed(TabContents* source) OVERRIDE; | 894 virtual void WorkerCrashed(TabContents* source) OVERRIDE; |
| 895 virtual void DidNavigateMainFramePostCommit(TabContents* tab) OVERRIDE; | 895 virtual void DidNavigateMainFramePostCommit(TabContents* tab) OVERRIDE; |
| 896 virtual void DidNavigateToPendingEntry(TabContents* tab) OVERRIDE; | 896 virtual void DidNavigateToPendingEntry(TabContents* tab) OVERRIDE; |
| 897 virtual content::JavaScriptDialogCreator* | 897 virtual content::JavaScriptDialogCreator* |
| 898 GetJavaScriptDialogCreator() OVERRIDE; | 898 GetJavaScriptDialogCreator() OVERRIDE; |
| 899 virtual void UpdatePreferredSize(TabContents* source, |
| 900 const gfx::Size& pref_size) OVERRIDE; |
| 899 | 901 |
| 900 // Overridden from TabContentsWrapperDelegate: | 902 // Overridden from TabContentsWrapperDelegate: |
| 901 virtual void OnDidGetApplicationInfo(TabContentsWrapper* source, | 903 virtual void OnDidGetApplicationInfo(TabContentsWrapper* source, |
| 902 int32 page_id) OVERRIDE; | 904 int32 page_id) OVERRIDE; |
| 903 virtual void OnInstallApplication( | 905 virtual void OnInstallApplication( |
| 904 TabContentsWrapper* source, | 906 TabContentsWrapper* source, |
| 905 const WebApplicationInfo& app_info) OVERRIDE; | 907 const WebApplicationInfo& app_info) OVERRIDE; |
| 906 | 908 |
| 907 // Note that the caller is responsible for deleting |old_tab_contents|. | 909 // Note that the caller is responsible for deleting |old_tab_contents|. |
| 908 virtual void SwapTabContents(TabContentsWrapper* old_tab_contents, | 910 virtual void SwapTabContents(TabContentsWrapper* old_tab_contents, |
| (...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1284 | 1286 |
| 1285 scoped_ptr<InstantController> instant_; | 1287 scoped_ptr<InstantController> instant_; |
| 1286 scoped_ptr<InstantUnloadHandler> instant_unload_handler_; | 1288 scoped_ptr<InstantUnloadHandler> instant_unload_handler_; |
| 1287 | 1289 |
| 1288 BookmarkBar::State bookmark_bar_state_; | 1290 BookmarkBar::State bookmark_bar_state_; |
| 1289 | 1291 |
| 1290 DISALLOW_COPY_AND_ASSIGN(Browser); | 1292 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 1291 }; | 1293 }; |
| 1292 | 1294 |
| 1293 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 1295 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |