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

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

Issue 10692113: Wire up GetUserMedia in Chrome Frame. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: moved media thread changes to issue 10744002 Created 8 years, 5 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/ui/browser.cc ('k') | chrome/browser/ui/views/external_tab_container_win.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_VIEWS_EXTERNAL_TAB_CONTAINER_WIN_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_EXTERNAL_TAB_CONTAINER_WIN_H_
6 #define CHROME_BROWSER_UI_VIEWS_EXTERNAL_TAB_CONTAINER_WIN_H_ 6 #define CHROME_BROWSER_UI_VIEWS_EXTERNAL_TAB_CONTAINER_WIN_H_
7 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 bool user_gesture) OVERRIDE; 168 bool user_gesture) OVERRIDE;
169 virtual void WebIntentDispatch( 169 virtual void WebIntentDispatch(
170 content::WebContents* tab, 170 content::WebContents* tab,
171 content::WebIntentsDispatcher* intents_dispatcher) OVERRIDE; 171 content::WebIntentsDispatcher* intents_dispatcher) OVERRIDE;
172 virtual void FindReply(content::WebContents* tab, 172 virtual void FindReply(content::WebContents* tab,
173 int request_id, 173 int request_id,
174 int number_of_matches, 174 int number_of_matches,
175 const gfx::Rect& selection_rect, 175 const gfx::Rect& selection_rect,
176 int active_match_ordinal, 176 int active_match_ordinal,
177 bool final_update) OVERRIDE; 177 bool final_update) OVERRIDE;
178 virtual void RequestMediaAccessPermission(
179 content::WebContents* web_contents,
180 const content::MediaStreamRequest* request,
181 const content::MediaResponseCallback& callback) OVERRIDE;
178 182
179 void RegisterRenderViewHost(content::RenderViewHost* render_view_host); 183 void RegisterRenderViewHost(content::RenderViewHost* render_view_host);
180 void UnregisterRenderViewHost(content::RenderViewHost* render_view_host); 184 void UnregisterRenderViewHost(content::RenderViewHost* render_view_host);
181 185
182 // Overridden from content::WebContentsObserver: 186 // Overridden from content::WebContentsObserver:
183 virtual bool OnMessageReceived(const IPC::Message& message); 187 virtual bool OnMessageReceived(const IPC::Message& message);
184 virtual void DidFailProvisionalLoad( 188 virtual void DidFailProvisionalLoad(
185 int64 frame_id, 189 int64 frame_id,
186 bool is_main_frame, 190 bool is_main_frame,
187 const GURL& validated_url, 191 const GURL& validated_url,
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
391 return false; 395 return false;
392 } 396 }
393 397
394 virtual void BeforeUnloadFired(content::WebContents* tab, bool proceed, 398 virtual void BeforeUnloadFired(content::WebContents* tab, bool proceed,
395 bool* proceed_to_fire_unload) { 399 bool* proceed_to_fire_unload) {
396 NOTREACHED(); 400 NOTREACHED();
397 } 401 }
398 }; 402 };
399 403
400 #endif // CHROME_BROWSER_UI_VIEWS_EXTERNAL_TAB_CONTAINER_WIN_H_ 404 #endif // CHROME_BROWSER_UI_VIEWS_EXTERNAL_TAB_CONTAINER_WIN_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | chrome/browser/ui/views/external_tab_container_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698