| 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 532 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 543 // Change is the result of window toggling in/out of fullscreen mode. | 543 // Change is the result of window toggling in/out of fullscreen mode. |
| 544 BOOKMARK_BAR_STATE_CHANGE_TOGGLE_FULLSCREEN, | 544 BOOKMARK_BAR_STATE_CHANGE_TOGGLE_FULLSCREEN, |
| 545 }; | 545 }; |
| 546 | 546 |
| 547 // Overridden from content::WebContentsDelegate: | 547 // Overridden from content::WebContentsDelegate: |
| 548 content::WebContents* OpenURLFromTab( | 548 content::WebContents* OpenURLFromTab( |
| 549 content::WebContents* source, | 549 content::WebContents* source, |
| 550 const content::OpenURLParams& params) override; | 550 const content::OpenURLParams& params) override; |
| 551 void NavigationStateChanged(content::WebContents* source, | 551 void NavigationStateChanged(content::WebContents* source, |
| 552 content::InvalidateTypes changed_flags) override; | 552 content::InvalidateTypes changed_flags) override; |
| 553 void VisibleSSLStateChanged(const content::WebContents* source) override; | 553 void VisibleSSLStateChanged(content::WebContents* source) override; |
| 554 void AddNewContents(content::WebContents* source, | 554 void AddNewContents(content::WebContents* source, |
| 555 content::WebContents* new_contents, | 555 content::WebContents* new_contents, |
| 556 WindowOpenDisposition disposition, | 556 WindowOpenDisposition disposition, |
| 557 const gfx::Rect& initial_rect, | 557 const gfx::Rect& initial_rect, |
| 558 bool user_gesture, | 558 bool user_gesture, |
| 559 bool* was_blocked) override; | 559 bool* was_blocked) override; |
| 560 void ActivateContents(content::WebContents* contents) override; | 560 void ActivateContents(content::WebContents* contents) override; |
| 561 void DeactivateContents(content::WebContents* contents) override; | 561 void DeactivateContents(content::WebContents* contents) override; |
| 562 void LoadingStateChanged(content::WebContents* source, | 562 void LoadingStateChanged(content::WebContents* source, |
| 563 bool to_different_document) override; | 563 bool to_different_document) override; |
| (...skipping 414 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 978 // The following factory is used for chrome update coalescing. | 978 // The following factory is used for chrome update coalescing. |
| 979 base::WeakPtrFactory<Browser> chrome_updater_factory_; | 979 base::WeakPtrFactory<Browser> chrome_updater_factory_; |
| 980 | 980 |
| 981 // The following factory is used to close the frame at a later time. | 981 // The following factory is used to close the frame at a later time. |
| 982 base::WeakPtrFactory<Browser> weak_factory_; | 982 base::WeakPtrFactory<Browser> weak_factory_; |
| 983 | 983 |
| 984 DISALLOW_COPY_AND_ASSIGN(Browser); | 984 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 985 }; | 985 }; |
| 986 | 986 |
| 987 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 987 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |