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