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

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

Issue 2706813004: Move logic to show permission prompts into MediaStreamDevicesController (Closed)
Patch Set: Created 3 years, 10 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/common/focus_cycler.h" 7 #include "ash/common/focus_cycler.h"
8 #include "ash/common/system/status_area_widget_delegate.h" 8 #include "ash/common/system/status_area_widget_delegate.h"
9 #include "ash/common/system/tray/system_tray.h" 9 #include "ash/common/system/tray/system_tray.h"
10 #include "ash/common/wm_shell.h" 10 #include "ash/common/wm_shell.h"
(...skipping 543 matching lines...) Expand 10 before | Expand all | Expand 10 after
554 } 554 }
555 555
556 return true; 556 return true;
557 } 557 }
558 558
559 void WebUILoginView::RequestMediaAccessPermission( 559 void WebUILoginView::RequestMediaAccessPermission(
560 WebContents* web_contents, 560 WebContents* web_contents,
561 const content::MediaStreamRequest& request, 561 const content::MediaStreamRequest& request,
562 const content::MediaResponseCallback& callback) { 562 const content::MediaResponseCallback& callback) {
563 // Note: This is only needed for SAML logins. 563 // Note: This is only needed for SAML logins.
564 MediaStreamDevicesController controller(web_contents, request, callback); 564 MediaStreamDevicesController::RequestPermissions(web_contents, request,
565 DCHECK(!controller.IsAskingForAudio() && !controller.IsAskingForVideo()); 565 callback);
566 } 566 }
567 567
568 bool WebUILoginView::CheckMediaAccessPermission( 568 bool WebUILoginView::CheckMediaAccessPermission(
569 content::WebContents* web_contents, 569 content::WebContents* web_contents,
570 const GURL& security_origin, 570 const GURL& security_origin,
571 content::MediaStreamType type) { 571 content::MediaStreamType type) {
572 return MediaCaptureDevicesDispatcher::GetInstance() 572 return MediaCaptureDevicesDispatcher::GetInstance()
573 ->CheckMediaAccessPermission(web_contents, security_origin, type); 573 ->CheckMediaAccessPermission(web_contents, security_origin, type);
574 } 574 }
575 575
(...skipping 16 matching lines...) Expand all
592 if (should_emit_login_prompt_visible_) { 592 if (should_emit_login_prompt_visible_) {
593 VLOG(1) << "Login WebUI >> login-prompt-visible"; 593 VLOG(1) << "Login WebUI >> login-prompt-visible";
594 chromeos::DBusThreadManager::Get()->GetSessionManagerClient()-> 594 chromeos::DBusThreadManager::Get()->GetSessionManagerClient()->
595 EmitLoginPromptVisible(); 595 EmitLoginPromptVisible();
596 } 596 }
597 597
598 webui_visible_ = true; 598 webui_visible_ = true;
599 } 599 }
600 600
601 } // namespace chromeos 601 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698