| 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 390 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 401 const gfx::Rect& selection_rect, | 401 const gfx::Rect& selection_rect, |
| 402 int active_match_ordinal, | 402 int active_match_ordinal, |
| 403 bool final_update); | 403 bool final_update); |
| 404 | 404 |
| 405 // Helper function to handle media access requests. | 405 // Helper function to handle media access requests. |
| 406 static void RequestMediaAccessPermissionHelper( | 406 static void RequestMediaAccessPermissionHelper( |
| 407 content::WebContents* web_contents, | 407 content::WebContents* web_contents, |
| 408 const content::MediaStreamRequest* request, | 408 const content::MediaStreamRequest* request, |
| 409 const content::MediaResponseCallback& callback); | 409 const content::MediaResponseCallback& callback); |
| 410 | 410 |
| 411 // Helper function to handle PPAPI broker access requests. |
| 412 static void RequestPpapiBrokerPermissionHelper( |
| 413 content::WebContents* web_contets, |
| 414 const GURL& url, |
| 415 const FilePath& plugin_path, |
| 416 const base::Callback<void(bool)>& callback); |
| 417 |
| 411 // Called by chrome::Navigate() when a navigation has occurred in a tab in | 418 // Called by chrome::Navigate() when a navigation has occurred in a tab in |
| 412 // this Browser. Updates the UI for the start of this navigation. | 419 // this Browser. Updates the UI for the start of this navigation. |
| 413 void UpdateUIForNavigationInTab(TabContents* contents, | 420 void UpdateUIForNavigationInTab(TabContents* contents, |
| 414 content::PageTransition transition, | 421 content::PageTransition transition, |
| 415 bool user_initiated); | 422 bool user_initiated); |
| 416 | 423 |
| 417 // Interface implementations //////////////////////////////////////////////// | 424 // Interface implementations //////////////////////////////////////////////// |
| 418 | 425 |
| 419 // Overridden from content::PageNavigator: | 426 // Overridden from content::PageNavigator: |
| 420 virtual content::WebContents* OpenURL( | 427 virtual content::WebContents* OpenURL( |
| (...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 637 int active_match_ordinal, | 644 int active_match_ordinal, |
| 638 bool final_update) OVERRIDE; | 645 bool final_update) OVERRIDE; |
| 639 virtual void RequestToLockMouse(content::WebContents* web_contents, | 646 virtual void RequestToLockMouse(content::WebContents* web_contents, |
| 640 bool user_gesture, | 647 bool user_gesture, |
| 641 bool last_unlocked_by_target) OVERRIDE; | 648 bool last_unlocked_by_target) OVERRIDE; |
| 642 virtual void LostMouseLock() OVERRIDE; | 649 virtual void LostMouseLock() OVERRIDE; |
| 643 virtual void RequestMediaAccessPermission( | 650 virtual void RequestMediaAccessPermission( |
| 644 content::WebContents* web_contents, | 651 content::WebContents* web_contents, |
| 645 const content::MediaStreamRequest* request, | 652 const content::MediaStreamRequest* request, |
| 646 const content::MediaResponseCallback& callback) OVERRIDE; | 653 const content::MediaResponseCallback& callback) OVERRIDE; |
| 654 virtual void RequestPpapiBrokerPermission( |
| 655 content::WebContents* web_contents, |
| 656 const GURL& url, |
| 657 const FilePath& plugin_path, |
| 658 const base::Callback<void(bool)>& callback) OVERRIDE; |
| 647 | 659 |
| 648 // Overridden from CoreTabHelperDelegate: | 660 // Overridden from CoreTabHelperDelegate: |
| 649 // Note that the caller is responsible for deleting |old_tab_contents|. | 661 // Note that the caller is responsible for deleting |old_tab_contents|. |
| 650 virtual void SwapTabContents(TabContents* old_tab_contents, | 662 virtual void SwapTabContents(TabContents* old_tab_contents, |
| 651 TabContents* new_tab_contents) OVERRIDE; | 663 TabContents* new_tab_contents) OVERRIDE; |
| 652 virtual bool CanReloadContents(TabContents* source) const OVERRIDE; | 664 virtual bool CanReloadContents(TabContents* source) const OVERRIDE; |
| 653 virtual bool CanSaveContents(TabContents* source) const OVERRIDE; | 665 virtual bool CanSaveContents(TabContents* source) const OVERRIDE; |
| 654 | 666 |
| 655 // Overridden from SearchEngineTabHelperDelegate: | 667 // Overridden from SearchEngineTabHelperDelegate: |
| 656 virtual void ConfirmAddSearchProvider(TemplateURL* template_url, | 668 virtual void ConfirmAddSearchProvider(TemplateURL* template_url, |
| (...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 923 bool window_has_shown_; | 935 bool window_has_shown_; |
| 924 | 936 |
| 925 // Currently open color chooser. Non-NULL after OpenColorChooser is called and | 937 // Currently open color chooser. Non-NULL after OpenColorChooser is called and |
| 926 // before DidEndColorChooser is called. | 938 // before DidEndColorChooser is called. |
| 927 scoped_ptr<content::ColorChooser> color_chooser_; | 939 scoped_ptr<content::ColorChooser> color_chooser_; |
| 928 | 940 |
| 929 DISALLOW_COPY_AND_ASSIGN(Browser); | 941 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 930 }; | 942 }; |
| 931 | 943 |
| 932 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 944 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |