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 #pragma once | 7 #pragma once |
8 | 8 |
9 #include <map> | 9 #include <map> |
10 #include <set> | 10 #include <set> |
(...skipping 976 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
987 content::WebContents* tab, | 987 content::WebContents* tab, |
988 const webkit_glue::WebIntentServiceData& data, | 988 const webkit_glue::WebIntentServiceData& data, |
989 bool user_gesture) OVERRIDE; | 989 bool user_gesture) OVERRIDE; |
990 virtual void WebIntentDispatch( | 990 virtual void WebIntentDispatch( |
991 content::WebContents* tab, | 991 content::WebContents* tab, |
992 content::WebIntentsDispatcher* intents_dispatcher) OVERRIDE; | 992 content::WebIntentsDispatcher* intents_dispatcher) OVERRIDE; |
993 virtual void UpdatePreferredSize(content::WebContents* source, | 993 virtual void UpdatePreferredSize(content::WebContents* source, |
994 const gfx::Size& pref_size) OVERRIDE; | 994 const gfx::Size& pref_size) OVERRIDE; |
995 virtual void ResizeDueToAutoResize(content::WebContents* source, | 995 virtual void ResizeDueToAutoResize(content::WebContents* source, |
996 const gfx::Size& new_size) OVERRIDE; | 996 const gfx::Size& new_size) OVERRIDE; |
997 | |
998 virtual void FindReply(content::WebContents* tab, | 997 virtual void FindReply(content::WebContents* tab, |
999 int request_id, | 998 int request_id, |
1000 int number_of_matches, | 999 int number_of_matches, |
1001 const gfx::Rect& selection_rect, | 1000 const gfx::Rect& selection_rect, |
1002 int active_match_ordinal, | 1001 int active_match_ordinal, |
1003 bool final_update) OVERRIDE; | 1002 bool final_update) OVERRIDE; |
1004 | |
1005 virtual void RequestToLockMouse(content::WebContents* tab, | 1003 virtual void RequestToLockMouse(content::WebContents* tab, |
1006 bool user_gesture, | 1004 bool user_gesture, |
1007 bool last_unlocked_by_target) OVERRIDE; | 1005 bool last_unlocked_by_target) OVERRIDE; |
1008 virtual void LostMouseLock() OVERRIDE; | 1006 virtual void LostMouseLock() OVERRIDE; |
| 1007 virtual void RequestMediaAccessPermission( |
| 1008 content::WebContents* web_contents, |
| 1009 const content::MediaStreamRequest* request, |
| 1010 const content::MediaResponseCallback& callback) OVERRIDE; |
1009 | 1011 |
1010 // Overridden from CoreTabHelperDelegate: | 1012 // Overridden from CoreTabHelperDelegate: |
1011 // Note that the caller is responsible for deleting |old_tab_contents|. | 1013 // Note that the caller is responsible for deleting |old_tab_contents|. |
1012 virtual void SwapTabContents(TabContents* old_tab_contents, | 1014 virtual void SwapTabContents(TabContents* old_tab_contents, |
1013 TabContents* new_tab_contents) OVERRIDE; | 1015 TabContents* new_tab_contents) OVERRIDE; |
1014 | 1016 |
1015 // Overridden from SearchEngineTabHelperDelegate: | 1017 // Overridden from SearchEngineTabHelperDelegate: |
1016 virtual void ConfirmAddSearchProvider(TemplateURL* template_url, | 1018 virtual void ConfirmAddSearchProvider(TemplateURL* template_url, |
1017 Profile* profile) OVERRIDE; | 1019 Profile* profile) OVERRIDE; |
1018 | 1020 |
(...skipping 410 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1429 bool window_has_shown_; | 1431 bool window_has_shown_; |
1430 | 1432 |
1431 // Currently open color chooser. Non-NULL after OpenColorChooser is called and | 1433 // Currently open color chooser. Non-NULL after OpenColorChooser is called and |
1432 // before DidEndColorChooser is called. | 1434 // before DidEndColorChooser is called. |
1433 scoped_ptr<content::ColorChooser> color_chooser_; | 1435 scoped_ptr<content::ColorChooser> color_chooser_; |
1434 | 1436 |
1435 DISALLOW_COPY_AND_ASSIGN(Browser); | 1437 DISALLOW_COPY_AND_ASSIGN(Browser); |
1436 }; | 1438 }; |
1437 | 1439 |
1438 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 1440 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
OLD | NEW |