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

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

Issue 10542092: Refactor the content interface for RequestMediaAccessPermission. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 6 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 | « chrome/browser/profiles/profile_impl_io_data.cc ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »
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 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 991 matching lines...) Expand 10 before | Expand all | Expand 10 after
1002 content::WebContents* web_contents, 1002 content::WebContents* web_contents,
1003 const webkit_glue::WebIntentServiceData& data, 1003 const webkit_glue::WebIntentServiceData& data,
1004 bool user_gesture) OVERRIDE; 1004 bool user_gesture) OVERRIDE;
1005 virtual void WebIntentDispatch( 1005 virtual void WebIntentDispatch(
1006 content::WebContents* web_contents, 1006 content::WebContents* web_contents,
1007 content::WebIntentsDispatcher* intents_dispatcher) OVERRIDE; 1007 content::WebIntentsDispatcher* intents_dispatcher) OVERRIDE;
1008 virtual void UpdatePreferredSize(content::WebContents* source, 1008 virtual void UpdatePreferredSize(content::WebContents* source,
1009 const gfx::Size& pref_size) OVERRIDE; 1009 const gfx::Size& pref_size) OVERRIDE;
1010 virtual void ResizeDueToAutoResize(content::WebContents* source, 1010 virtual void ResizeDueToAutoResize(content::WebContents* source,
1011 const gfx::Size& new_size) OVERRIDE; 1011 const gfx::Size& new_size) OVERRIDE;
1012
1013 virtual void FindReply(content::WebContents* web_contents, 1012 virtual void FindReply(content::WebContents* web_contents,
1014 int request_id, 1013 int request_id,
1015 int number_of_matches, 1014 int number_of_matches,
1016 const gfx::Rect& selection_rect, 1015 const gfx::Rect& selection_rect,
1017 int active_match_ordinal, 1016 int active_match_ordinal,
1018 bool final_update) OVERRIDE; 1017 bool final_update) OVERRIDE;
1019
1020 virtual void RequestToLockMouse(content::WebContents* web_contents, 1018 virtual void RequestToLockMouse(content::WebContents* web_contents,
1021 bool user_gesture, 1019 bool user_gesture,
1022 bool last_unlocked_by_target) OVERRIDE; 1020 bool last_unlocked_by_target) OVERRIDE;
1023 virtual void LostMouseLock() OVERRIDE; 1021 virtual void LostMouseLock() OVERRIDE;
1022 virtual void RequestMediaAccessPermission(
1023 content::WebContents* web_contents,
1024 const content::MediaStreamRequest* request,
1025 const content::MediaResponseCallback& callback) OVERRIDE;
1024 1026
1025 // Overridden from CoreTabHelperDelegate: 1027 // Overridden from CoreTabHelperDelegate:
1026 // Note that the caller is responsible for deleting |old_tab_contents|. 1028 // Note that the caller is responsible for deleting |old_tab_contents|.
1027 virtual void SwapTabContents(TabContents* old_tab_contents, 1029 virtual void SwapTabContents(TabContents* old_tab_contents,
1028 TabContents* new_tab_contents) OVERRIDE; 1030 TabContents* new_tab_contents) OVERRIDE;
1029 1031
1030 // Overridden from SearchEngineTabHelperDelegate: 1032 // Overridden from SearchEngineTabHelperDelegate:
1031 virtual void ConfirmAddSearchProvider(TemplateURL* template_url, 1033 virtual void ConfirmAddSearchProvider(TemplateURL* template_url,
1032 Profile* profile) OVERRIDE; 1034 Profile* profile) OVERRIDE;
1033 1035
(...skipping 411 matching lines...) Expand 10 before | Expand all | Expand 10 after
1445 bool window_has_shown_; 1447 bool window_has_shown_;
1446 1448
1447 // Currently open color chooser. Non-NULL after OpenColorChooser is called and 1449 // Currently open color chooser. Non-NULL after OpenColorChooser is called and
1448 // before DidEndColorChooser is called. 1450 // before DidEndColorChooser is called.
1449 scoped_ptr<content::ColorChooser> color_chooser_; 1451 scoped_ptr<content::ColorChooser> color_chooser_;
1450 1452
1451 DISALLOW_COPY_AND_ASSIGN(Browser); 1453 DISALLOW_COPY_AND_ASSIGN(Browser);
1452 }; 1454 };
1453 1455
1454 #endif // CHROME_BROWSER_UI_BROWSER_H_ 1456 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile_impl_io_data.cc ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698