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 593 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
604 content::WebContents* web_contents, | 604 content::WebContents* web_contents, |
605 SkColor color, | 605 SkColor color, |
606 const std::vector<content::ColorSuggestion>& suggestions) override; | 606 const std::vector<content::ColorSuggestion>& suggestions) override; |
607 void RunFileChooser(content::WebContents* web_contents, | 607 void RunFileChooser(content::WebContents* web_contents, |
608 const content::FileChooserParams& params) override; | 608 const content::FileChooserParams& params) override; |
609 void EnumerateDirectory(content::WebContents* web_contents, | 609 void EnumerateDirectory(content::WebContents* web_contents, |
610 int request_id, | 610 int request_id, |
611 const base::FilePath& path) override; | 611 const base::FilePath& path) override; |
612 bool EmbedsFullscreenWidget() const override; | 612 bool EmbedsFullscreenWidget() const override; |
613 void ToggleFullscreenModeForTab(content::WebContents* web_contents, | 613 void ToggleFullscreenModeForTab(content::WebContents* web_contents, |
| 614 const GURL& origin, |
614 bool enter_fullscreen) override; | 615 bool enter_fullscreen) override; |
615 bool IsFullscreenForTabOrPending( | 616 bool IsFullscreenForTabOrPending( |
616 const content::WebContents* web_contents) const override; | 617 const content::WebContents* web_contents) const override; |
617 void RegisterProtocolHandler(content::WebContents* web_contents, | 618 void RegisterProtocolHandler(content::WebContents* web_contents, |
618 const std::string& protocol, | 619 const std::string& protocol, |
619 const GURL& url, | 620 const GURL& url, |
620 bool user_gesture) override; | 621 bool user_gesture) override; |
621 void UnregisterProtocolHandler(content::WebContents* web_contents, | 622 void UnregisterProtocolHandler(content::WebContents* web_contents, |
622 const std::string& protocol, | 623 const std::string& protocol, |
623 const GURL& url, | 624 const GURL& url, |
(...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
966 | 967 |
967 scoped_ptr<chrome::ValidationMessageBubble> validation_message_bubble_; | 968 scoped_ptr<chrome::ValidationMessageBubble> validation_message_bubble_; |
968 | 969 |
969 // The following factory is used to close the frame at a later time. | 970 // The following factory is used to close the frame at a later time. |
970 base::WeakPtrFactory<Browser> weak_factory_; | 971 base::WeakPtrFactory<Browser> weak_factory_; |
971 | 972 |
972 DISALLOW_COPY_AND_ASSIGN(Browser); | 973 DISALLOW_COPY_AND_ASSIGN(Browser); |
973 }; | 974 }; |
974 | 975 |
975 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 976 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
OLD | NEW |