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 403 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
414 bool user_gesture); | 414 bool user_gesture); |
415 | 415 |
416 // Helper function to handle find results. | 416 // Helper function to handle find results. |
417 static void FindReplyHelper(content::WebContents* web_contents, | 417 static void FindReplyHelper(content::WebContents* web_contents, |
418 int request_id, | 418 int request_id, |
419 int number_of_matches, | 419 int number_of_matches, |
420 const gfx::Rect& selection_rect, | 420 const gfx::Rect& selection_rect, |
421 int active_match_ordinal, | 421 int active_match_ordinal, |
422 bool final_update); | 422 bool final_update); |
423 | 423 |
| 424 // Helper function to handle media access requests. |
| 425 static void RequestMediaAccessPermissionHelper( |
| 426 content::WebContents* web_contents, |
| 427 const content::MediaStreamRequest* request, |
| 428 const content::MediaResponseCallback& callback); |
| 429 |
424 // Called by chrome::Navigate() when a navigation has occurred in a tab in | 430 // Called by chrome::Navigate() when a navigation has occurred in a tab in |
425 // this Browser. Updates the UI for the start of this navigation. | 431 // this Browser. Updates the UI for the start of this navigation. |
426 void UpdateUIForNavigationInTab(TabContents* contents, | 432 void UpdateUIForNavigationInTab(TabContents* contents, |
427 content::PageTransition transition, | 433 content::PageTransition transition, |
428 bool user_initiated); | 434 bool user_initiated); |
429 | 435 |
430 // Interface implementations //////////////////////////////////////////////// | 436 // Interface implementations //////////////////////////////////////////////// |
431 | 437 |
432 // Overridden from content::PageNavigator: | 438 // Overridden from content::PageNavigator: |
433 virtual content::WebContents* OpenURL( | 439 virtual content::WebContents* OpenURL( |
(...skipping 588 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1022 bool window_has_shown_; | 1028 bool window_has_shown_; |
1023 | 1029 |
1024 // Currently open color chooser. Non-NULL after OpenColorChooser is called and | 1030 // Currently open color chooser. Non-NULL after OpenColorChooser is called and |
1025 // before DidEndColorChooser is called. | 1031 // before DidEndColorChooser is called. |
1026 scoped_ptr<content::ColorChooser> color_chooser_; | 1032 scoped_ptr<content::ColorChooser> color_chooser_; |
1027 | 1033 |
1028 DISALLOW_COPY_AND_ASSIGN(Browser); | 1034 DISALLOW_COPY_AND_ASSIGN(Browser); |
1029 }; | 1035 }; |
1030 | 1036 |
1031 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 1037 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
OLD | NEW |