Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(301)

Side by Side Diff: chrome/browser/ui/browser.h

Issue 10854040: Add hooks to content to request permission to connect to the PPAPI broker. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/ui/browser.cc » ('j') | chrome/browser/ui/browser.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 380 matching lines...) Expand 10 before | Expand all | Expand 10 after
391 const gfx::Rect& selection_rect, 391 const gfx::Rect& selection_rect,
392 int active_match_ordinal, 392 int active_match_ordinal,
393 bool final_update); 393 bool final_update);
394 394
395 // Helper function to handle media access requests. 395 // Helper function to handle media access requests.
396 static void RequestMediaAccessPermissionHelper( 396 static void RequestMediaAccessPermissionHelper(
397 content::WebContents* web_contents, 397 content::WebContents* web_contents,
398 const content::MediaStreamRequest* request, 398 const content::MediaStreamRequest* request,
399 const content::MediaResponseCallback& callback); 399 const content::MediaResponseCallback& callback);
400 400
401 // Helper function to handle PPAPI broker access requests.
402 static void RequestPpapiBrokerPermissionHelper(
403 content::WebContents* web_contets,
404 const GURL& url,
405 const FilePath& plugin_path,
406 const base::Callback<void(bool)>& callback);
407
401 // Called by chrome::Navigate() when a navigation has occurred in a tab in 408 // Called by chrome::Navigate() when a navigation has occurred in a tab in
402 // this Browser. Updates the UI for the start of this navigation. 409 // this Browser. Updates the UI for the start of this navigation.
403 void UpdateUIForNavigationInTab(TabContents* contents, 410 void UpdateUIForNavigationInTab(TabContents* contents,
404 content::PageTransition transition, 411 content::PageTransition transition,
405 bool user_initiated); 412 bool user_initiated);
406 413
407 // Interface implementations //////////////////////////////////////////////// 414 // Interface implementations ////////////////////////////////////////////////
408 415
409 // Overridden from content::PageNavigator: 416 // Overridden from content::PageNavigator:
410 virtual content::WebContents* OpenURL( 417 virtual content::WebContents* OpenURL(
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
627 int active_match_ordinal, 634 int active_match_ordinal,
628 bool final_update) OVERRIDE; 635 bool final_update) OVERRIDE;
629 virtual void RequestToLockMouse(content::WebContents* web_contents, 636 virtual void RequestToLockMouse(content::WebContents* web_contents,
630 bool user_gesture, 637 bool user_gesture,
631 bool last_unlocked_by_target) OVERRIDE; 638 bool last_unlocked_by_target) OVERRIDE;
632 virtual void LostMouseLock() OVERRIDE; 639 virtual void LostMouseLock() OVERRIDE;
633 virtual void RequestMediaAccessPermission( 640 virtual void RequestMediaAccessPermission(
634 content::WebContents* web_contents, 641 content::WebContents* web_contents,
635 const content::MediaStreamRequest* request, 642 const content::MediaStreamRequest* request,
636 const content::MediaResponseCallback& callback) OVERRIDE; 643 const content::MediaResponseCallback& callback) OVERRIDE;
644 virtual void RequestPpapiBrokerPermission(
645 content::WebContents* web_contents,
646 const GURL& url,
647 const FilePath& plugin_path,
648 const base::Callback<void(bool)>& callback) OVERRIDE;
637 649
638 // Overridden from CoreTabHelperDelegate: 650 // Overridden from CoreTabHelperDelegate:
639 // Note that the caller is responsible for deleting |old_tab_contents|. 651 // Note that the caller is responsible for deleting |old_tab_contents|.
640 virtual void SwapTabContents(TabContents* old_tab_contents, 652 virtual void SwapTabContents(TabContents* old_tab_contents,
641 TabContents* new_tab_contents) OVERRIDE; 653 TabContents* new_tab_contents) OVERRIDE;
642 virtual bool CanReloadContents(TabContents* source) const OVERRIDE; 654 virtual bool CanReloadContents(TabContents* source) const OVERRIDE;
643 virtual bool CanSaveContents(TabContents* source) const OVERRIDE; 655 virtual bool CanSaveContents(TabContents* source) const OVERRIDE;
644 656
645 // Overridden from SearchEngineTabHelperDelegate: 657 // Overridden from SearchEngineTabHelperDelegate:
646 virtual void ConfirmAddSearchProvider(TemplateURL* template_url, 658 virtual void ConfirmAddSearchProvider(TemplateURL* template_url,
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after
911 bool window_has_shown_; 923 bool window_has_shown_;
912 924
913 // Currently open color chooser. Non-NULL after OpenColorChooser is called and 925 // Currently open color chooser. Non-NULL after OpenColorChooser is called and
914 // before DidEndColorChooser is called. 926 // before DidEndColorChooser is called.
915 scoped_ptr<content::ColorChooser> color_chooser_; 927 scoped_ptr<content::ColorChooser> color_chooser_;
916 928
917 DISALLOW_COPY_AND_ASSIGN(Browser); 929 DISALLOW_COPY_AND_ASSIGN(Browser);
918 }; 930 };
919 931
920 #endif // CHROME_BROWSER_UI_BROWSER_H_ 932 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/browser.cc » ('j') | chrome/browser/ui/browser.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698