| 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 560 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 571 // Change is the result of window toggling in/out of fullscreen mode. | 571 // Change is the result of window toggling in/out of fullscreen mode. |
| 572 BOOKMARK_BAR_STATE_CHANGE_TOGGLE_FULLSCREEN, | 572 BOOKMARK_BAR_STATE_CHANGE_TOGGLE_FULLSCREEN, |
| 573 }; | 573 }; |
| 574 | 574 |
| 575 // Overridden from content::WebContentsDelegate: | 575 // Overridden from content::WebContentsDelegate: |
| 576 content::WebContents* OpenURLFromTab( | 576 content::WebContents* OpenURLFromTab( |
| 577 content::WebContents* source, | 577 content::WebContents* source, |
| 578 const content::OpenURLParams& params) override; | 578 const content::OpenURLParams& params) override; |
| 579 void NavigationStateChanged(content::WebContents* source, | 579 void NavigationStateChanged(content::WebContents* source, |
| 580 content::InvalidateTypes changed_flags) override; | 580 content::InvalidateTypes changed_flags) override; |
| 581 void VisibleSSLStateChanged(content::WebContents* source) override; | 581 void VisibleSecurityStateChanged(content::WebContents* source) override; |
| 582 void AddNewContents(content::WebContents* source, | 582 void AddNewContents(content::WebContents* source, |
| 583 content::WebContents* new_contents, | 583 content::WebContents* new_contents, |
| 584 WindowOpenDisposition disposition, | 584 WindowOpenDisposition disposition, |
| 585 const gfx::Rect& initial_rect, | 585 const gfx::Rect& initial_rect, |
| 586 bool user_gesture, | 586 bool user_gesture, |
| 587 bool* was_blocked) override; | 587 bool* was_blocked) override; |
| 588 void ActivateContents(content::WebContents* contents) override; | 588 void ActivateContents(content::WebContents* contents) override; |
| 589 void LoadingStateChanged(content::WebContents* source, | 589 void LoadingStateChanged(content::WebContents* source, |
| 590 bool to_different_document) override; | 590 bool to_different_document) override; |
| 591 void CloseContents(content::WebContents* source) override; | 591 void CloseContents(content::WebContents* source) override; |
| (...skipping 418 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1010 // The following factory is used for chrome update coalescing. | 1010 // The following factory is used for chrome update coalescing. |
| 1011 base::WeakPtrFactory<Browser> chrome_updater_factory_; | 1011 base::WeakPtrFactory<Browser> chrome_updater_factory_; |
| 1012 | 1012 |
| 1013 // The following factory is used to close the frame at a later time. | 1013 // The following factory is used to close the frame at a later time. |
| 1014 base::WeakPtrFactory<Browser> weak_factory_; | 1014 base::WeakPtrFactory<Browser> weak_factory_; |
| 1015 | 1015 |
| 1016 DISALLOW_COPY_AND_ASSIGN(Browser); | 1016 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 1017 }; | 1017 }; |
| 1018 | 1018 |
| 1019 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 1019 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |