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 539 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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(const 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, |
| 561 bool user_gesture) override; |
561 void DeactivateContents(content::WebContents* contents) override; | 562 void DeactivateContents(content::WebContents* contents) override; |
562 void LoadingStateChanged(content::WebContents* source, | 563 void LoadingStateChanged(content::WebContents* source, |
563 bool to_different_document) override; | 564 bool to_different_document) override; |
564 void CloseContents(content::WebContents* source) override; | 565 void CloseContents(content::WebContents* source) override; |
565 void MoveContents(content::WebContents* source, | 566 void MoveContents(content::WebContents* source, |
566 const gfx::Rect& pos) override; | 567 const gfx::Rect& pos) override; |
567 bool IsPopupOrPanel(const content::WebContents* source) const override; | 568 bool IsPopupOrPanel(const content::WebContents* source) const override; |
568 void UpdateTargetURL(content::WebContents* source, const GURL& url) override; | 569 void UpdateTargetURL(content::WebContents* source, const GURL& url) override; |
569 void ContentsMouseEvent(content::WebContents* source, | 570 void ContentsMouseEvent(content::WebContents* source, |
570 const gfx::Point& location, | 571 const gfx::Point& location, |
(...skipping 410 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
981 // The following factory is used for chrome update coalescing. | 982 // The following factory is used for chrome update coalescing. |
982 base::WeakPtrFactory<Browser> chrome_updater_factory_; | 983 base::WeakPtrFactory<Browser> chrome_updater_factory_; |
983 | 984 |
984 // The following factory is used to close the frame at a later time. | 985 // The following factory is used to close the frame at a later time. |
985 base::WeakPtrFactory<Browser> weak_factory_; | 986 base::WeakPtrFactory<Browser> weak_factory_; |
986 | 987 |
987 DISALLOW_COPY_AND_ASSIGN(Browser); | 988 DISALLOW_COPY_AND_ASSIGN(Browser); |
988 }; | 989 }; |
989 | 990 |
990 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 991 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
OLD | NEW |