| 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 521 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 void 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, |
| 543 bool* was_blocked) OVERRIDE; |
| 543 virtual void ActivateContents(content::WebContents* contents) OVERRIDE; | 544 virtual void ActivateContents(content::WebContents* contents) OVERRIDE; |
| 544 virtual void DeactivateContents(content::WebContents* contents) OVERRIDE; | 545 virtual void DeactivateContents(content::WebContents* contents) OVERRIDE; |
| 545 virtual void LoadingStateChanged(content::WebContents* source) OVERRIDE; | 546 virtual void LoadingStateChanged(content::WebContents* source) OVERRIDE; |
| 546 virtual void CloseContents(content::WebContents* source) OVERRIDE; | 547 virtual void CloseContents(content::WebContents* source) OVERRIDE; |
| 547 virtual void MoveContents(content::WebContents* source, | 548 virtual void MoveContents(content::WebContents* source, |
| 548 const gfx::Rect& pos) OVERRIDE; | 549 const gfx::Rect& pos) OVERRIDE; |
| 549 virtual bool IsPopupOrPanel( | 550 virtual bool IsPopupOrPanel( |
| 550 const content::WebContents* source) const OVERRIDE; | 551 const content::WebContents* source) const OVERRIDE; |
| 551 virtual void UpdateTargetURL(content::WebContents* source, int32 page_id, | 552 virtual void UpdateTargetURL(content::WebContents* source, int32 page_id, |
| 552 const GURL& url) OVERRIDE; | 553 const GURL& url) OVERRIDE; |
| (...skipping 378 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 931 bool window_has_shown_; | 932 bool window_has_shown_; |
| 932 | 933 |
| 933 // Currently open color chooser. Non-NULL after OpenColorChooser is called and | 934 // Currently open color chooser. Non-NULL after OpenColorChooser is called and |
| 934 // before DidEndColorChooser is called. | 935 // before DidEndColorChooser is called. |
| 935 scoped_ptr<content::ColorChooser> color_chooser_; | 936 scoped_ptr<content::ColorChooser> color_chooser_; |
| 936 | 937 |
| 937 DISALLOW_COPY_AND_ASSIGN(Browser); | 938 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 938 }; | 939 }; |
| 939 | 940 |
| 940 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 941 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |