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