Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 747 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 758 bool user_initiated); | 758 bool user_initiated); |
| 759 | 759 |
| 760 // Shows the cookies collected in the tab contents wrapper. | 760 // Shows the cookies collected in the tab contents wrapper. |
| 761 void ShowCollectedCookiesDialog(TabContentsWrapper* wrapper); | 761 void ShowCollectedCookiesDialog(TabContentsWrapper* wrapper); |
| 762 | 762 |
| 763 // Interface implementations //////////////////////////////////////////////// | 763 // Interface implementations //////////////////////////////////////////////// |
| 764 | 764 |
| 765 // Overridden from content::PageNavigator: | 765 // Overridden from content::PageNavigator: |
| 766 virtual content::WebContents* OpenURL( | 766 virtual content::WebContents* OpenURL( |
| 767 const content::OpenURLParams& params) OVERRIDE; | 767 const content::OpenURLParams& params) OVERRIDE; |
| 768 virtual content::WebContents* OpenURLFromTab( | |
|
dominich
2012/02/28 16:21:00
indent
cbentzel
2012/02/29 18:16:13
Done.
| |
| 769 content::WebContents* source, | |
| 770 const content::OpenURLParams& params) OVERRIDE; | |
| 768 | 771 |
| 769 // Overridden from CommandUpdater::CommandUpdaterDelegate: | 772 // Overridden from CommandUpdater::CommandUpdaterDelegate: |
| 770 virtual void ExecuteCommand(int id) OVERRIDE; | 773 virtual void ExecuteCommand(int id) OVERRIDE; |
| 771 | 774 |
| 772 // Overridden from TabRestoreServiceObserver: | 775 // Overridden from TabRestoreServiceObserver: |
| 773 virtual void TabRestoreServiceChanged(TabRestoreService* service) OVERRIDE; | 776 virtual void TabRestoreServiceChanged(TabRestoreService* service) OVERRIDE; |
| 774 virtual void TabRestoreServiceDestroyed(TabRestoreService* service) OVERRIDE; | 777 virtual void TabRestoreServiceDestroyed(TabRestoreService* service) OVERRIDE; |
| 775 | 778 |
| 776 // Centralized method for creating a TabContents, configuring and installing | 779 // Centralized method for creating a TabContents, configuring and installing |
| 777 // all its supporting objects and observers. | 780 // all its supporting objects and observers. |
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 913 BOOKMARK_BAR_STATE_CHANGE_PREF_CHANGE, | 916 BOOKMARK_BAR_STATE_CHANGE_PREF_CHANGE, |
| 914 | 917 |
| 915 // Change is the result of a state change in the active tab. | 918 // Change is the result of a state change in the active tab. |
| 916 BOOKMARK_BAR_STATE_CHANGE_TAB_STATE, | 919 BOOKMARK_BAR_STATE_CHANGE_TAB_STATE, |
| 917 | 920 |
| 918 // Change is the result of window toggling in/out of fullscreen mode. | 921 // Change is the result of window toggling in/out of fullscreen mode. |
| 919 BOOKMARK_BAR_STATE_CHANGE_TOGGLE_FULLSCREEN, | 922 BOOKMARK_BAR_STATE_CHANGE_TOGGLE_FULLSCREEN, |
| 920 }; | 923 }; |
| 921 | 924 |
| 922 // Overridden from content::WebContentsDelegate: | 925 // Overridden from content::WebContentsDelegate: |
| 923 virtual content::WebContents* OpenURLFromTab( | |
| 924 content::WebContents* source, | |
| 925 const content::OpenURLParams& params) OVERRIDE; | |
| 926 virtual void NavigationStateChanged(const content::WebContents* source, | 926 virtual void NavigationStateChanged(const content::WebContents* source, |
| 927 unsigned changed_flags) OVERRIDE; | 927 unsigned changed_flags) OVERRIDE; |
| 928 virtual void AddNewContents(content::WebContents* source, | 928 virtual void AddNewContents(content::WebContents* source, |
| 929 content::WebContents* new_contents, | 929 content::WebContents* new_contents, |
| 930 WindowOpenDisposition disposition, | 930 WindowOpenDisposition disposition, |
| 931 const gfx::Rect& initial_pos, | 931 const gfx::Rect& initial_pos, |
| 932 bool user_gesture) OVERRIDE; | 932 bool user_gesture) OVERRIDE; |
| 933 virtual void ActivateContents(content::WebContents* contents) OVERRIDE; | 933 virtual void ActivateContents(content::WebContents* contents) OVERRIDE; |
| 934 virtual void DeactivateContents(content::WebContents* contents) OVERRIDE; | 934 virtual void DeactivateContents(content::WebContents* contents) OVERRIDE; |
| 935 virtual void LoadingStateChanged(content::WebContents* source) OVERRIDE; | 935 virtual void LoadingStateChanged(content::WebContents* source) OVERRIDE; |
| (...skipping 509 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1445 | 1445 |
| 1446 scoped_refptr<FullscreenController> fullscreen_controller_; | 1446 scoped_refptr<FullscreenController> fullscreen_controller_; |
| 1447 | 1447 |
| 1448 // True if the browser window has been shown at least once. | 1448 // True if the browser window has been shown at least once. |
| 1449 bool window_has_shown_; | 1449 bool window_has_shown_; |
| 1450 | 1450 |
| 1451 DISALLOW_COPY_AND_ASSIGN(Browser); | 1451 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 1452 }; | 1452 }; |
| 1453 | 1453 |
| 1454 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 1454 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |