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 531 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
542 virtual void NavigationStateChanged(const content::WebContents* source, | 542 virtual void NavigationStateChanged(const content::WebContents* source, |
543 unsigned changed_flags) OVERRIDE; | 543 unsigned changed_flags) OVERRIDE; |
544 virtual void AddNewContents(content::WebContents* source, | 544 virtual void AddNewContents(content::WebContents* source, |
545 content::WebContents* new_contents, | 545 content::WebContents* new_contents, |
546 WindowOpenDisposition disposition, | 546 WindowOpenDisposition disposition, |
547 const gfx::Rect& initial_pos, | 547 const gfx::Rect& initial_pos, |
548 bool user_gesture, | 548 bool user_gesture, |
549 bool* was_blocked) OVERRIDE; | 549 bool* was_blocked) OVERRIDE; |
550 virtual void ActivateContents(content::WebContents* contents) OVERRIDE; | 550 virtual void ActivateContents(content::WebContents* contents) OVERRIDE; |
551 virtual void DeactivateContents(content::WebContents* contents) OVERRIDE; | 551 virtual void DeactivateContents(content::WebContents* contents) OVERRIDE; |
552 virtual void LoadingStateChanged(content::WebContents* source) OVERRIDE; | 552 virtual void LoadingStateChanged(content::WebContents* source, |
| 553 bool to_different_document) OVERRIDE; |
553 virtual void CloseContents(content::WebContents* source) OVERRIDE; | 554 virtual void CloseContents(content::WebContents* source) OVERRIDE; |
554 virtual void MoveContents(content::WebContents* source, | 555 virtual void MoveContents(content::WebContents* source, |
555 const gfx::Rect& pos) OVERRIDE; | 556 const gfx::Rect& pos) OVERRIDE; |
556 virtual bool IsPopupOrPanel( | 557 virtual bool IsPopupOrPanel( |
557 const content::WebContents* source) const OVERRIDE; | 558 const content::WebContents* source) const OVERRIDE; |
558 virtual void UpdateTargetURL(content::WebContents* source, int32 page_id, | 559 virtual void UpdateTargetURL(content::WebContents* source, int32 page_id, |
559 const GURL& url) OVERRIDE; | 560 const GURL& url) OVERRIDE; |
560 virtual void ContentsMouseEvent(content::WebContents* source, | 561 virtual void ContentsMouseEvent(content::WebContents* source, |
561 const gfx::Point& location, | 562 const gfx::Point& location, |
562 bool motion) OVERRIDE; | 563 bool motion) OVERRIDE; |
(...skipping 365 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
928 base::WeakPtrFactory<Browser> weak_factory_; | 929 base::WeakPtrFactory<Browser> weak_factory_; |
929 | 930 |
930 scoped_ptr<BrowserContentTranslateDriverObserver> translate_driver_observer_; | 931 scoped_ptr<BrowserContentTranslateDriverObserver> translate_driver_observer_; |
931 | 932 |
932 scoped_ptr<chrome::ValidationMessageBubble> validation_message_bubble_; | 933 scoped_ptr<chrome::ValidationMessageBubble> validation_message_bubble_; |
933 | 934 |
934 DISALLOW_COPY_AND_ASSIGN(Browser); | 935 DISALLOW_COPY_AND_ASSIGN(Browser); |
935 }; | 936 }; |
936 | 937 |
937 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 938 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
OLD | NEW |