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 988 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
999 int request_id, | 999 int request_id, |
1000 int number_of_matches, | 1000 int number_of_matches, |
1001 const gfx::Rect& selection_rect, | 1001 const gfx::Rect& selection_rect, |
1002 int active_match_ordinal, | 1002 int active_match_ordinal, |
1003 bool final_update) OVERRIDE; | 1003 bool final_update) OVERRIDE; |
1004 | 1004 |
1005 virtual void RequestToLockMouse(content::WebContents* tab, | 1005 virtual void RequestToLockMouse(content::WebContents* tab, |
1006 bool user_gesture, | 1006 bool user_gesture, |
1007 bool last_unlocked_by_target) OVERRIDE; | 1007 bool last_unlocked_by_target) OVERRIDE; |
1008 virtual void LostMouseLock() OVERRIDE; | 1008 virtual void LostMouseLock() OVERRIDE; |
1009 | 1009 |
jam
2012/06/11 05:31:57
nit: please take out this blank line, and the coup
Evan Stade
2012/06/12 00:00:46
Done.
| |
1010 virtual void RequestMediaAccessPermission( | |
1011 content::WebContents* web_contents, | |
1012 const content::MediaStreamRequest* request, | |
1013 const content::MediaResponseCallback& callback) OVERRIDE; | |
1014 | |
1010 // Overridden from CoreTabHelperDelegate: | 1015 // Overridden from CoreTabHelperDelegate: |
1011 // Note that the caller is responsible for deleting |old_tab_contents|. | 1016 // Note that the caller is responsible for deleting |old_tab_contents|. |
1012 virtual void SwapTabContents(TabContents* old_tab_contents, | 1017 virtual void SwapTabContents(TabContents* old_tab_contents, |
1013 TabContents* new_tab_contents) OVERRIDE; | 1018 TabContents* new_tab_contents) OVERRIDE; |
1014 | 1019 |
1015 // Overridden from SearchEngineTabHelperDelegate: | 1020 // Overridden from SearchEngineTabHelperDelegate: |
1016 virtual void ConfirmAddSearchProvider(TemplateURL* template_url, | 1021 virtual void ConfirmAddSearchProvider(TemplateURL* template_url, |
1017 Profile* profile) OVERRIDE; | 1022 Profile* profile) OVERRIDE; |
1018 | 1023 |
1019 // Overridden from ConstrainedWindowTabHelperDelegate: | 1024 // Overridden from ConstrainedWindowTabHelperDelegate: |
(...skipping 410 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1430 bool window_has_shown_; | 1435 bool window_has_shown_; |
1431 | 1436 |
1432 // Currently open color chooser. Non-NULL after OpenColorChooser is called and | 1437 // Currently open color chooser. Non-NULL after OpenColorChooser is called and |
1433 // before DidEndColorChooser is called. | 1438 // before DidEndColorChooser is called. |
1434 scoped_ptr<content::ColorChooser> color_chooser_; | 1439 scoped_ptr<content::ColorChooser> color_chooser_; |
1435 | 1440 |
1436 DISALLOW_COPY_AND_ASSIGN(Browser); | 1441 DISALLOW_COPY_AND_ASSIGN(Browser); |
1437 }; | 1442 }; |
1438 | 1443 |
1439 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 1444 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
OLD | NEW |