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