| 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 <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <map> | 10 #include <map> |
| (...skipping 674 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 685 // Overridden from CoreTabHelperDelegate: | 685 // Overridden from CoreTabHelperDelegate: |
| 686 // Note that the caller is responsible for deleting |old_contents|. | 686 // Note that the caller is responsible for deleting |old_contents|. |
| 687 void SwapTabContents(content::WebContents* old_contents, | 687 void SwapTabContents(content::WebContents* old_contents, |
| 688 content::WebContents* new_contents, | 688 content::WebContents* new_contents, |
| 689 bool did_start_load, | 689 bool did_start_load, |
| 690 bool did_finish_load) override; | 690 bool did_finish_load) override; |
| 691 bool CanReloadContents(content::WebContents* web_contents) const override; | 691 bool CanReloadContents(content::WebContents* web_contents) const override; |
| 692 bool CanSaveContents(content::WebContents* web_contents) const override; | 692 bool CanSaveContents(content::WebContents* web_contents) const override; |
| 693 | 693 |
| 694 // Overridden from SearchTabHelperDelegate: | 694 // Overridden from SearchTabHelperDelegate: |
| 695 void NavigateOnThumbnailClick(const GURL& url, | |
| 696 WindowOpenDisposition disposition, | |
| 697 content::WebContents* source_contents) override; | |
| 698 void OnWebContentsInstantSupportDisabled( | 695 void OnWebContentsInstantSupportDisabled( |
| 699 const content::WebContents* web_contents) override; | 696 const content::WebContents* web_contents) override; |
| 700 OmniboxView* GetOmniboxView() override; | 697 OmniboxView* GetOmniboxView() override; |
| 701 std::set<std::string> GetOpenUrls() override; | 698 std::set<std::string> GetOpenUrls() override; |
| 702 | 699 |
| 703 // Overridden from WebContentsModalDialogManagerDelegate: | 700 // Overridden from WebContentsModalDialogManagerDelegate: |
| 704 void SetWebContentsBlocked(content::WebContents* web_contents, | 701 void SetWebContentsBlocked(content::WebContents* web_contents, |
| 705 bool blocked) override; | 702 bool blocked) override; |
| 706 web_modal::WebContentsModalDialogHost* GetWebContentsModalDialogHost() | 703 web_modal::WebContentsModalDialogHost* GetWebContentsModalDialogHost() |
| 707 override; | 704 override; |
| (...skipping 303 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1011 // The following factory is used for chrome update coalescing. | 1008 // The following factory is used for chrome update coalescing. |
| 1012 base::WeakPtrFactory<Browser> chrome_updater_factory_; | 1009 base::WeakPtrFactory<Browser> chrome_updater_factory_; |
| 1013 | 1010 |
| 1014 // The following factory is used to close the frame at a later time. | 1011 // The following factory is used to close the frame at a later time. |
| 1015 base::WeakPtrFactory<Browser> weak_factory_; | 1012 base::WeakPtrFactory<Browser> weak_factory_; |
| 1016 | 1013 |
| 1017 DISALLOW_COPY_AND_ASSIGN(Browser); | 1014 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 1018 }; | 1015 }; |
| 1019 | 1016 |
| 1020 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 1017 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |