| 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 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 756 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 767 DetachType type); | 767 DetachType type); |
| 768 | 768 |
| 769 // Shared code between Reload() and ReloadIgnoringCache(). | 769 // Shared code between Reload() and ReloadIgnoringCache(). |
| 770 void ReloadInternal(WindowOpenDisposition disposition, bool ignore_cache); | 770 void ReloadInternal(WindowOpenDisposition disposition, bool ignore_cache); |
| 771 | 771 |
| 772 // Depending on the disposition, return the current tab or a clone of the | 772 // Depending on the disposition, return the current tab or a clone of the |
| 773 // current tab. | 773 // current tab. |
| 774 content::WebContents* GetOrCloneTabForDisposition( | 774 content::WebContents* GetOrCloneTabForDisposition( |
| 775 WindowOpenDisposition disposition); | 775 WindowOpenDisposition disposition); |
| 776 | 776 |
| 777 // Returns true if the Browser window should show the location bar. |
| 778 bool ShouldShowLocationBar() const; |
| 779 |
| 777 // Implementation of SupportsWindowFeature and CanSupportWindowFeature. If | 780 // Implementation of SupportsWindowFeature and CanSupportWindowFeature. If |
| 778 // |check_fullscreen| is true, the set of features reflect the actual state of | 781 // |check_fullscreen| is true, the set of features reflect the actual state of |
| 779 // the browser, otherwise the set of features reflect the possible state of | 782 // the browser, otherwise the set of features reflect the possible state of |
| 780 // the browser. | 783 // the browser. |
| 781 bool SupportsWindowFeatureImpl(WindowFeature feature, | 784 bool SupportsWindowFeatureImpl(WindowFeature feature, |
| 782 bool check_fullscreen) const; | 785 bool check_fullscreen) const; |
| 783 | 786 |
| 784 // Resets |bookmark_bar_state_| based on the active tab. Notifies the | 787 // Resets |bookmark_bar_state_| based on the active tab. Notifies the |
| 785 // BrowserWindow if necessary. | 788 // BrowserWindow if necessary. |
| 786 void UpdateBookmarkBarState(BookmarkBarStateChangeReason reason); | 789 void UpdateBookmarkBarState(BookmarkBarStateChangeReason reason); |
| (...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 930 base::WeakPtrFactory<Browser> weak_factory_; | 933 base::WeakPtrFactory<Browser> weak_factory_; |
| 931 | 934 |
| 932 scoped_ptr<BrowserContentTranslateDriverObserver> translate_driver_observer_; | 935 scoped_ptr<BrowserContentTranslateDriverObserver> translate_driver_observer_; |
| 933 | 936 |
| 934 scoped_ptr<chrome::ValidationMessageBubble> validation_message_bubble_; | 937 scoped_ptr<chrome::ValidationMessageBubble> validation_message_bubble_; |
| 935 | 938 |
| 936 DISALLOW_COPY_AND_ASSIGN(Browser); | 939 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 937 }; | 940 }; |
| 938 | 941 |
| 939 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 942 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |