| 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 530 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 541 // Overridden from content::WebContentsDelegate: | 541 // Overridden from content::WebContentsDelegate: |
| 542 content::WebContents* OpenURLFromTab( | 542 content::WebContents* OpenURLFromTab( |
| 543 content::WebContents* source, | 543 content::WebContents* source, |
| 544 const content::OpenURLParams& params) override; | 544 const content::OpenURLParams& params) override; |
| 545 void NavigationStateChanged(content::WebContents* source, | 545 void NavigationStateChanged(content::WebContents* source, |
| 546 content::InvalidateTypes changed_flags) override; | 546 content::InvalidateTypes changed_flags) override; |
| 547 void VisibleSSLStateChanged(const content::WebContents* source) override; | 547 void VisibleSSLStateChanged(const content::WebContents* source) override; |
| 548 void AddNewContents(content::WebContents* source, | 548 void AddNewContents(content::WebContents* source, |
| 549 content::WebContents* new_contents, | 549 content::WebContents* new_contents, |
| 550 WindowOpenDisposition disposition, | 550 WindowOpenDisposition disposition, |
| 551 const gfx::Rect& initial_pos, | 551 const gfx::Rect& initial_rect, |
| 552 bool user_gesture, | 552 bool user_gesture, |
| 553 bool* was_blocked) override; | 553 bool* was_blocked) override; |
| 554 void ActivateContents(content::WebContents* contents) override; | 554 void ActivateContents(content::WebContents* contents) override; |
| 555 void DeactivateContents(content::WebContents* contents) override; | 555 void DeactivateContents(content::WebContents* contents) override; |
| 556 void LoadingStateChanged(content::WebContents* source, | 556 void LoadingStateChanged(content::WebContents* source, |
| 557 bool to_different_document) override; | 557 bool to_different_document) override; |
| 558 void CloseContents(content::WebContents* source) override; | 558 void CloseContents(content::WebContents* source) override; |
| 559 void MoveContents(content::WebContents* source, | 559 void MoveContents(content::WebContents* source, |
| 560 const gfx::Rect& pos) override; | 560 const gfx::Rect& pos) override; |
| 561 bool IsPopupOrPanel(const content::WebContents* source) const override; | 561 bool IsPopupOrPanel(const content::WebContents* source) const override; |
| (...skipping 408 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 970 // The following factory is used for chrome update coalescing. | 970 // The following factory is used for chrome update coalescing. |
| 971 base::WeakPtrFactory<Browser> chrome_updater_factory_; | 971 base::WeakPtrFactory<Browser> chrome_updater_factory_; |
| 972 | 972 |
| 973 // The following factory is used to close the frame at a later time. | 973 // The following factory is used to close the frame at a later time. |
| 974 base::WeakPtrFactory<Browser> weak_factory_; | 974 base::WeakPtrFactory<Browser> weak_factory_; |
| 975 | 975 |
| 976 DISALLOW_COPY_AND_ASSIGN(Browser); | 976 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 977 }; | 977 }; |
| 978 | 978 |
| 979 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 979 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |