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

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

Issue 11416013: Move RequestPpapiBrokerPermission from WebContentsObserver to WebContentsDelegate. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review Created 8 years, 1 month 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
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 632 matching lines...) Expand 10 before | Expand all | Expand 10 after
643 int active_match_ordinal, 643 int active_match_ordinal,
644 bool final_update) OVERRIDE; 644 bool final_update) OVERRIDE;
645 virtual void RequestToLockMouse(content::WebContents* web_contents, 645 virtual void RequestToLockMouse(content::WebContents* web_contents,
646 bool user_gesture, 646 bool user_gesture,
647 bool last_unlocked_by_target) OVERRIDE; 647 bool last_unlocked_by_target) OVERRIDE;
648 virtual void LostMouseLock() OVERRIDE; 648 virtual void LostMouseLock() OVERRIDE;
649 virtual void RequestMediaAccessPermission( 649 virtual void RequestMediaAccessPermission(
650 content::WebContents* web_contents, 650 content::WebContents* web_contents,
651 const content::MediaStreamRequest* request, 651 const content::MediaStreamRequest* request,
652 const content::MediaResponseCallback& callback) OVERRIDE; 652 const content::MediaResponseCallback& callback) OVERRIDE;
653 virtual void RequestPpapiBrokerPermission(
654 content::WebContents* web_contents,
655 const GURL& url,
656 const FilePath& plugin_path,
657 const base::Callback<void(bool)>& callback) OVERRIDE;
653 658
654 // Overridden from CoreTabHelperDelegate: 659 // Overridden from CoreTabHelperDelegate:
655 // Note that the caller is responsible for deleting |old_tab_contents|. 660 // Note that the caller is responsible for deleting |old_tab_contents|.
656 virtual void SwapTabContents(content::WebContents* old_contents, 661 virtual void SwapTabContents(content::WebContents* old_contents,
657 content::WebContents* new_contents) OVERRIDE; 662 content::WebContents* new_contents) OVERRIDE;
658 virtual bool CanReloadContents( 663 virtual bool CanReloadContents(
659 content::WebContents* web_contents) const OVERRIDE; 664 content::WebContents* web_contents) const OVERRIDE;
660 virtual bool CanSaveContents( 665 virtual bool CanSaveContents(
661 content::WebContents* web_contents) const OVERRIDE; 666 content::WebContents* web_contents) const OVERRIDE;
662 667
(...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after
951 bool window_has_shown_; 956 bool window_has_shown_;
952 957
953 // Currently open color chooser. Non-NULL after OpenColorChooser is called and 958 // Currently open color chooser. Non-NULL after OpenColorChooser is called and
954 // before DidEndColorChooser is called. 959 // before DidEndColorChooser is called.
955 scoped_ptr<content::ColorChooser> color_chooser_; 960 scoped_ptr<content::ColorChooser> color_chooser_;
956 961
957 DISALLOW_COPY_AND_ASSIGN(Browser); 962 DISALLOW_COPY_AND_ASSIGN(Browser);
958 }; 963 };
959 964
960 #endif // CHROME_BROWSER_UI_BROWSER_H_ 965 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698