| 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 813 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 824 virtual bool PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event, | 824 virtual bool PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event, |
| 825 bool* is_keyboard_shortcut); | 825 bool* is_keyboard_shortcut); |
| 826 virtual void HandleKeyboardEvent(const NativeWebKeyboardEvent& event); | 826 virtual void HandleKeyboardEvent(const NativeWebKeyboardEvent& event); |
| 827 virtual void ShowRepostFormWarningDialog(TabContents* tab_contents); | 827 virtual void ShowRepostFormWarningDialog(TabContents* tab_contents); |
| 828 virtual void ShowCollectedCookiesDialog(TabContents* tab_contents); | 828 virtual void ShowCollectedCookiesDialog(TabContents* tab_contents); |
| 829 virtual bool ShouldAddNavigationToHistory( | 829 virtual bool ShouldAddNavigationToHistory( |
| 830 const history::HistoryAddPageArgs& add_page_args, | 830 const history::HistoryAddPageArgs& add_page_args, |
| 831 NavigationType::Type navigation_type); | 831 NavigationType::Type navigation_type); |
| 832 virtual void ContentRestrictionsChanged(TabContents* source); | 832 virtual void ContentRestrictionsChanged(TabContents* source); |
| 833 virtual void WorkerCrashed(); | 833 virtual void WorkerCrashed(); |
| 834 virtual bool IsHidden(const TabContents* source) const OVERRIDE; |
| 834 | 835 |
| 835 // Overridden from TabContentsWrapperDelegate: | 836 // Overridden from TabContentsWrapperDelegate: |
| 836 virtual void OnDidGetApplicationInfo(TabContentsWrapper* source, | 837 virtual void OnDidGetApplicationInfo(TabContentsWrapper* source, |
| 837 int32 page_id) OVERRIDE; | 838 int32 page_id) OVERRIDE; |
| 838 virtual void OnInstallApplication( | 839 virtual void OnInstallApplication( |
| 839 TabContentsWrapper* source, | 840 TabContentsWrapper* source, |
| 840 const WebApplicationInfo& app_info) OVERRIDE; | 841 const WebApplicationInfo& app_info) OVERRIDE; |
| 841 | 842 |
| 842 // Note that the caller is responsible for deleting |old_tab_contents|. | 843 // Note that the caller is responsible for deleting |old_tab_contents|. |
| 843 virtual void SwapTabContents(TabContentsWrapper* old_tab_contents, | 844 virtual void SwapTabContents(TabContentsWrapper* old_tab_contents, |
| (...skipping 371 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1215 // Helper which implements the TabRestoreServiceDelegate interface. | 1216 // Helper which implements the TabRestoreServiceDelegate interface. |
| 1216 scoped_ptr<BrowserTabRestoreServiceDelegate> tab_restore_service_delegate_; | 1217 scoped_ptr<BrowserTabRestoreServiceDelegate> tab_restore_service_delegate_; |
| 1217 | 1218 |
| 1218 scoped_ptr<InstantController> instant_; | 1219 scoped_ptr<InstantController> instant_; |
| 1219 scoped_ptr<InstantUnloadHandler> instant_unload_handler_; | 1220 scoped_ptr<InstantUnloadHandler> instant_unload_handler_; |
| 1220 | 1221 |
| 1221 DISALLOW_COPY_AND_ASSIGN(Browser); | 1222 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 1222 }; | 1223 }; |
| 1223 | 1224 |
| 1224 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 1225 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |