| 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 517 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 528 // Change is the result of window toggling in/out of fullscreen mode. | 528 // Change is the result of window toggling in/out of fullscreen mode. |
| 529 BOOKMARK_BAR_STATE_CHANGE_TOGGLE_FULLSCREEN, | 529 BOOKMARK_BAR_STATE_CHANGE_TOGGLE_FULLSCREEN, |
| 530 }; | 530 }; |
| 531 | 531 |
| 532 // Overridden from content::WebContentsDelegate: | 532 // Overridden from content::WebContentsDelegate: |
| 533 virtual content::WebContents* OpenURLFromTab( | 533 virtual content::WebContents* OpenURLFromTab( |
| 534 content::WebContents* source, | 534 content::WebContents* source, |
| 535 const content::OpenURLParams& params) OVERRIDE; | 535 const content::OpenURLParams& params) OVERRIDE; |
| 536 virtual void NavigationStateChanged(const content::WebContents* source, | 536 virtual void NavigationStateChanged(const content::WebContents* source, |
| 537 unsigned changed_flags) OVERRIDE; | 537 unsigned changed_flags) OVERRIDE; |
| 538 virtual void AddNewContents(content::WebContents* source, | 538 virtual bool AddNewContents(content::WebContents* source, |
| 539 content::WebContents* new_contents, | 539 content::WebContents* new_contents, |
| 540 WindowOpenDisposition disposition, | 540 WindowOpenDisposition disposition, |
| 541 const gfx::Rect& initial_pos, | 541 const gfx::Rect& initial_pos, |
| 542 bool user_gesture) OVERRIDE; | 542 bool user_gesture) OVERRIDE; |
| 543 virtual void ActivateContents(content::WebContents* contents) OVERRIDE; | 543 virtual void ActivateContents(content::WebContents* contents) OVERRIDE; |
| 544 virtual void DeactivateContents(content::WebContents* contents) OVERRIDE; | 544 virtual void DeactivateContents(content::WebContents* contents) OVERRIDE; |
| 545 virtual void LoadingStateChanged(content::WebContents* source) OVERRIDE; | 545 virtual void LoadingStateChanged(content::WebContents* source) OVERRIDE; |
| 546 virtual void CloseContents(content::WebContents* source) OVERRIDE; | 546 virtual void CloseContents(content::WebContents* source) OVERRIDE; |
| 547 virtual void MoveContents(content::WebContents* source, | 547 virtual void MoveContents(content::WebContents* source, |
| 548 const gfx::Rect& pos) OVERRIDE; | 548 const gfx::Rect& pos) OVERRIDE; |
| (...skipping 382 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 931 bool window_has_shown_; | 931 bool window_has_shown_; |
| 932 | 932 |
| 933 // Currently open color chooser. Non-NULL after OpenColorChooser is called and | 933 // Currently open color chooser. Non-NULL after OpenColorChooser is called and |
| 934 // before DidEndColorChooser is called. | 934 // before DidEndColorChooser is called. |
| 935 scoped_ptr<content::ColorChooser> color_chooser_; | 935 scoped_ptr<content::ColorChooser> color_chooser_; |
| 936 | 936 |
| 937 DISALLOW_COPY_AND_ASSIGN(Browser); | 937 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 938 }; | 938 }; |
| 939 | 939 |
| 940 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 940 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |