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

Side by Side Diff: chrome/browser/chromeos/login/ui/webui_login_view.cc

Issue 562263002: Check media permissions through RenderFrameHostDelegate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@render_frame_get_sources
Patch Set: Rebase Created 6 years, 3 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #include "chrome/browser/chromeos/login/ui/webui_login_view.h" 5 #include "chrome/browser/chromeos/login/ui/webui_login_view.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/system/tray/system_tray.h" 8 #include "ash/system/tray/system_tray.h"
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
11 #include "base/debug/trace_event.h" 11 #include "base/debug/trace_event.h"
12 #include "base/i18n/rtl.h" 12 #include "base/i18n/rtl.h"
13 #include "base/strings/utf_string_conversions.h" 13 #include "base/strings/utf_string_conversions.h"
14 #include "base/values.h" 14 #include "base/values.h"
15 #include "chrome/browser/chrome_notification_types.h" 15 #include "chrome/browser/chrome_notification_types.h"
16 #include "chrome/browser/chromeos/accessibility/accessibility_util.h" 16 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"
17 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h" 17 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
18 #include "chrome/browser/chromeos/login/ui/proxy_settings_dialog.h" 18 #include "chrome/browser/chromeos/login/ui/proxy_settings_dialog.h"
19 #include "chrome/browser/chromeos/login/ui/webui_login_display.h" 19 #include "chrome/browser/chromeos/login/ui/webui_login_display.h"
20 #include "chrome/browser/chromeos/profiles/profile_helper.h" 20 #include "chrome/browser/chromeos/profiles/profile_helper.h"
21 #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h" 21 #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h"
22 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
22 #include "chrome/browser/media/media_stream_infobar_delegate.h" 23 #include "chrome/browser/media/media_stream_infobar_delegate.h"
23 #include "chrome/browser/password_manager/chrome_password_manager_client.h" 24 #include "chrome/browser/password_manager/chrome_password_manager_client.h"
24 #include "chrome/browser/renderer_preferences_util.h" 25 #include "chrome/browser/renderer_preferences_util.h"
25 #include "chrome/browser/sessions/session_tab_helper.h" 26 #include "chrome/browser/sessions/session_tab_helper.h"
26 #include "chrome/browser/ui/autofill/chrome_autofill_client.h" 27 #include "chrome/browser/ui/autofill/chrome_autofill_client.h"
27 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" 28 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
28 #include "chrome/common/render_messages.h" 29 #include "chrome/common/render_messages.h"
29 #include "chromeos/dbus/dbus_thread_manager.h" 30 #include "chromeos/dbus/dbus_thread_manager.h"
30 #include "chromeos/dbus/session_manager_client.h" 31 #include "chromeos/dbus/session_manager_client.h"
31 #include "chromeos/network/network_state.h" 32 #include "chromeos/network/network_state.h"
(...skipping 413 matching lines...) Expand 10 before | Expand all | Expand 10 after
445 } 446 }
446 447
447 void WebUILoginView::RequestMediaAccessPermission( 448 void WebUILoginView::RequestMediaAccessPermission(
448 WebContents* web_contents, 449 WebContents* web_contents,
449 const content::MediaStreamRequest& request, 450 const content::MediaStreamRequest& request,
450 const content::MediaResponseCallback& callback) { 451 const content::MediaResponseCallback& callback) {
451 if (MediaStreamInfoBarDelegate::Create(web_contents, request, callback)) 452 if (MediaStreamInfoBarDelegate::Create(web_contents, request, callback))
452 NOTREACHED() << "Media stream not allowed for WebUI"; 453 NOTREACHED() << "Media stream not allowed for WebUI";
453 } 454 }
454 455
456 bool WebUILoginView::CheckMediaAccessPermission(
457 content::WebContents* web_contents,
458 const GURL& security_origin,
459 content::MediaStreamType type) {
460 return MediaCaptureDevicesDispatcher::GetInstance()
461 ->CheckMediaAccessPermission(web_contents, security_origin, type);
462 }
463
455 bool WebUILoginView::PreHandleGestureEvent( 464 bool WebUILoginView::PreHandleGestureEvent(
456 content::WebContents* source, 465 content::WebContents* source,
457 const blink::WebGestureEvent& event) { 466 const blink::WebGestureEvent& event) {
458 // Disable pinch zooming. 467 // Disable pinch zooming.
459 return event.type == blink::WebGestureEvent::GesturePinchBegin || 468 return event.type == blink::WebGestureEvent::GesturePinchBegin ||
460 event.type == blink::WebGestureEvent::GesturePinchUpdate || 469 event.type == blink::WebGestureEvent::GesturePinchUpdate ||
461 event.type == blink::WebGestureEvent::GesturePinchEnd; 470 event.type == blink::WebGestureEvent::GesturePinchEnd;
462 } 471 }
463 472
464 void WebUILoginView::DidFailProvisionalLoad( 473 void WebUILoginView::DidFailProvisionalLoad(
(...skipping 28 matching lines...) Expand all
493 webui_visible_ = true; 502 webui_visible_ = true;
494 } 503 }
495 504
496 void WebUILoginView::ReturnFocus(bool reverse) { 505 void WebUILoginView::ReturnFocus(bool reverse) {
497 // Return the focus to the web contents. 506 // Return the focus to the web contents.
498 webui_login_->web_contents()->FocusThroughTabTraversal(reverse); 507 webui_login_->web_contents()->FocusThroughTabTraversal(reverse);
499 GetWidget()->Activate(); 508 GetWidget()->Activate();
500 } 509 }
501 510
502 } // namespace chromeos 511 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/ui/webui_login_view.h ('k') | chrome/browser/extensions/chrome_extension_host_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698