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 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <map> | 10 #include <map> |
| 11 #include <memory> | 11 #include <memory> |
| 12 #include <set> | 12 #include <set> |
|
msw
2016/12/13 22:31:53
nit: remove
Marc Treib
2016/12/14 11:12:22
Done.
| |
| 13 #include <string> | 13 #include <string> |
| 14 #include <vector> | 14 #include <vector> |
| 15 | 15 |
| 16 #include "base/compiler_specific.h" | 16 #include "base/compiler_specific.h" |
| 17 #include "base/gtest_prod_util.h" | 17 #include "base/gtest_prod_util.h" |
| 18 #include "base/macros.h" | 18 #include "base/macros.h" |
| 19 #include "base/memory/weak_ptr.h" | 19 #include "base/memory/weak_ptr.h" |
| 20 #include "base/scoped_observer.h" | 20 #include "base/scoped_observer.h" |
| 21 #include "base/strings/string16.h" | 21 #include "base/strings/string16.h" |
| 22 #include "build/build_config.h" | 22 #include "build/build_config.h" |
| (...skipping 669 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 692 content::WebContents* new_contents, | 692 content::WebContents* new_contents, |
| 693 bool did_start_load, | 693 bool did_start_load, |
| 694 bool did_finish_load) override; | 694 bool did_finish_load) override; |
| 695 bool CanReloadContents(content::WebContents* web_contents) const override; | 695 bool CanReloadContents(content::WebContents* web_contents) const override; |
| 696 bool CanSaveContents(content::WebContents* web_contents) const override; | 696 bool CanSaveContents(content::WebContents* web_contents) const override; |
| 697 | 697 |
| 698 // Overridden from SearchTabHelperDelegate: | 698 // Overridden from SearchTabHelperDelegate: |
| 699 void OnWebContentsInstantSupportDisabled( | 699 void OnWebContentsInstantSupportDisabled( |
| 700 const content::WebContents* web_contents) override; | 700 const content::WebContents* web_contents) override; |
| 701 OmniboxView* GetOmniboxView() override; | 701 OmniboxView* GetOmniboxView() override; |
| 702 std::set<std::string> GetOpenUrls() override; | |
| 703 | 702 |
| 704 // Overridden from WebContentsModalDialogManagerDelegate: | 703 // Overridden from WebContentsModalDialogManagerDelegate: |
| 705 void SetWebContentsBlocked(content::WebContents* web_contents, | 704 void SetWebContentsBlocked(content::WebContents* web_contents, |
| 706 bool blocked) override; | 705 bool blocked) override; |
| 707 web_modal::WebContentsModalDialogHost* GetWebContentsModalDialogHost() | 706 web_modal::WebContentsModalDialogHost* GetWebContentsModalDialogHost() |
| 708 override; | 707 override; |
| 709 | 708 |
| 710 // Overridden from BookmarkTabHelperDelegate: | 709 // Overridden from BookmarkTabHelperDelegate: |
| 711 void URLStarredChanged(content::WebContents* web_contents, | 710 void URLStarredChanged(content::WebContents* web_contents, |
| 712 bool starred) override; | 711 bool starred) override; |
| (...skipping 297 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1010 // The following factory is used for chrome update coalescing. | 1009 // The following factory is used for chrome update coalescing. |
| 1011 base::WeakPtrFactory<Browser> chrome_updater_factory_; | 1010 base::WeakPtrFactory<Browser> chrome_updater_factory_; |
| 1012 | 1011 |
| 1013 // The following factory is used to close the frame at a later time. | 1012 // The following factory is used to close the frame at a later time. |
| 1014 base::WeakPtrFactory<Browser> weak_factory_; | 1013 base::WeakPtrFactory<Browser> weak_factory_; |
| 1015 | 1014 |
| 1016 DISALLOW_COPY_AND_ASSIGN(Browser); | 1015 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 1017 }; | 1016 }; |
| 1018 | 1017 |
| 1019 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 1018 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |