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