| 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 393 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 404 static void FindReplyHelper(content::WebContents* web_contents, | 404 static void FindReplyHelper(content::WebContents* web_contents, |
| 405 int request_id, | 405 int request_id, |
| 406 int number_of_matches, | 406 int number_of_matches, |
| 407 const gfx::Rect& selection_rect, | 407 const gfx::Rect& selection_rect, |
| 408 int active_match_ordinal, | 408 int active_match_ordinal, |
| 409 bool final_update); | 409 bool final_update); |
| 410 | 410 |
| 411 // Helper function to handle media access requests. | 411 // Helper function to handle media access requests. |
| 412 static void RequestMediaAccessPermissionHelper( | 412 static void RequestMediaAccessPermissionHelper( |
| 413 content::WebContents* web_contents, | 413 content::WebContents* web_contents, |
| 414 const content::MediaStreamRequest* request, | 414 const content::MediaStreamRequest& request, |
| 415 const content::MediaResponseCallback& callback); | 415 const content::MediaResponseCallback& callback); |
| 416 | 416 |
| 417 // Called by chrome::Navigate() when a navigation has occurred in a tab in | 417 // Called by chrome::Navigate() when a navigation has occurred in a tab in |
| 418 // this Browser. Updates the UI for the start of this navigation. | 418 // this Browser. Updates the UI for the start of this navigation. |
| 419 void UpdateUIForNavigationInTab(content::WebContents* contents, | 419 void UpdateUIForNavigationInTab(content::WebContents* contents, |
| 420 content::PageTransition transition, | 420 content::PageTransition transition, |
| 421 bool user_initiated); | 421 bool user_initiated); |
| 422 | 422 |
| 423 // Interface implementations //////////////////////////////////////////////// | 423 // Interface implementations //////////////////////////////////////////////// |
| 424 | 424 |
| (...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 652 int number_of_matches, | 652 int number_of_matches, |
| 653 const gfx::Rect& selection_rect, | 653 const gfx::Rect& selection_rect, |
| 654 int active_match_ordinal, | 654 int active_match_ordinal, |
| 655 bool final_update) OVERRIDE; | 655 bool final_update) OVERRIDE; |
| 656 virtual void RequestToLockMouse(content::WebContents* web_contents, | 656 virtual void RequestToLockMouse(content::WebContents* web_contents, |
| 657 bool user_gesture, | 657 bool user_gesture, |
| 658 bool last_unlocked_by_target) OVERRIDE; | 658 bool last_unlocked_by_target) OVERRIDE; |
| 659 virtual void LostMouseLock() OVERRIDE; | 659 virtual void LostMouseLock() OVERRIDE; |
| 660 virtual void RequestMediaAccessPermission( | 660 virtual void RequestMediaAccessPermission( |
| 661 content::WebContents* web_contents, | 661 content::WebContents* web_contents, |
| 662 const content::MediaStreamRequest* request, | 662 const content::MediaStreamRequest& request, |
| 663 const content::MediaResponseCallback& callback) OVERRIDE; | 663 const content::MediaResponseCallback& callback) OVERRIDE; |
| 664 virtual bool RequestPpapiBrokerPermission( | 664 virtual bool RequestPpapiBrokerPermission( |
| 665 content::WebContents* web_contents, | 665 content::WebContents* web_contents, |
| 666 const GURL& url, | 666 const GURL& url, |
| 667 const FilePath& plugin_path, | 667 const FilePath& plugin_path, |
| 668 const base::Callback<void(bool)>& callback) OVERRIDE; | 668 const base::Callback<void(bool)>& callback) OVERRIDE; |
| 669 | 669 |
| 670 // Overridden from CoreTabHelperDelegate: | 670 // Overridden from CoreTabHelperDelegate: |
| 671 // Note that the caller is responsible for deleting |old_contents|. | 671 // Note that the caller is responsible for deleting |old_contents|. |
| 672 virtual void SwapTabContents(content::WebContents* old_contents, | 672 virtual void SwapTabContents(content::WebContents* old_contents, |
| (...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 960 bool window_has_shown_; | 960 bool window_has_shown_; |
| 961 | 961 |
| 962 // Currently open color chooser. Non-NULL after OpenColorChooser is called and | 962 // Currently open color chooser. Non-NULL after OpenColorChooser is called and |
| 963 // before DidEndColorChooser is called. | 963 // before DidEndColorChooser is called. |
| 964 scoped_ptr<content::ColorChooser> color_chooser_; | 964 scoped_ptr<content::ColorChooser> color_chooser_; |
| 965 | 965 |
| 966 DISALLOW_COPY_AND_ASSIGN(Browser); | 966 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 967 }; | 967 }; |
| 968 | 968 |
| 969 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 969 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |