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

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

Issue 2787283002: Chrome OS: Fix taking user pictures to be used as user POD images. (Closed)
Patch Set: Created 3 years, 8 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
« no previous file with comments | « no previous file | chrome/browser/media/webrtc/media_permission.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 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/tray/system_tray.h" 8 #include "ash/common/system/tray/system_tray.h"
9 #include "ash/common/wm_shell.h" 9 #include "ash/common/wm_shell.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 458 matching lines...) Expand 10 before | Expand all | Expand 10 after
469 reverse ? ash::FocusCycler::BACKWARD : ash::FocusCycler::FORWARD); 469 reverse ? ash::FocusCycler::BACKWARD : ash::FocusCycler::FORWARD);
470 } 470 }
471 471
472 return true; 472 return true;
473 } 473 }
474 474
475 void WebUILoginView::RequestMediaAccessPermission( 475 void WebUILoginView::RequestMediaAccessPermission(
476 WebContents* web_contents, 476 WebContents* web_contents,
477 const content::MediaStreamRequest& request, 477 const content::MediaStreamRequest& request,
478 const content::MediaResponseCallback& callback) { 478 const content::MediaResponseCallback& callback) {
479 // Note: This is only needed for SAML logins. 479 // Note: This is needed for taking photos when selecting new user images
480 // and SAML logins. Must work for all user types (including supervised).
480 MediaStreamDevicesController::RequestPermissions(web_contents, request, 481 MediaStreamDevicesController::RequestPermissions(web_contents, request,
481 callback); 482 callback);
482 } 483 }
483 484
484 bool WebUILoginView::CheckMediaAccessPermission( 485 bool WebUILoginView::CheckMediaAccessPermission(
485 content::WebContents* web_contents, 486 content::WebContents* web_contents,
486 const GURL& security_origin, 487 const GURL& security_origin,
487 content::MediaStreamType type) { 488 content::MediaStreamType type) {
488 return MediaCaptureDevicesDispatcher::GetInstance() 489 return MediaCaptureDevicesDispatcher::GetInstance()
489 ->CheckMediaAccessPermission(web_contents, security_origin, type); 490 ->CheckMediaAccessPermission(web_contents, security_origin, type);
(...skipping 18 matching lines...) Expand all
508 if (should_emit_login_prompt_visible_) { 509 if (should_emit_login_prompt_visible_) {
509 VLOG(1) << "Login WebUI >> login-prompt-visible"; 510 VLOG(1) << "Login WebUI >> login-prompt-visible";
510 chromeos::DBusThreadManager::Get()->GetSessionManagerClient()-> 511 chromeos::DBusThreadManager::Get()->GetSessionManagerClient()->
511 EmitLoginPromptVisible(); 512 EmitLoginPromptVisible();
512 } 513 }
513 514
514 webui_visible_ = true; 515 webui_visible_ = true;
515 } 516 }
516 517
517 } // namespace chromeos 518 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/media/webrtc/media_permission.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698