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

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

Issue 2779463002: Chrome OS: Fix taking user pictures to be used as user POD images. (Closed)
Patch Set: Update after review. 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 453 matching lines...) Expand 10 before | Expand all | Expand 10 after
464 reverse ? ash::FocusCycler::BACKWARD : ash::FocusCycler::FORWARD); 464 reverse ? ash::FocusCycler::BACKWARD : ash::FocusCycler::FORWARD);
465 } 465 }
466 466
467 return true; 467 return true;
468 } 468 }
469 469
470 void WebUILoginView::RequestMediaAccessPermission( 470 void WebUILoginView::RequestMediaAccessPermission(
471 WebContents* web_contents, 471 WebContents* web_contents,
472 const content::MediaStreamRequest& request, 472 const content::MediaStreamRequest& request,
473 const content::MediaResponseCallback& callback) { 473 const content::MediaResponseCallback& callback) {
474 // Note: This is only needed for SAML logins. 474 // Note: This is needed for taking photos when selecting new user images
475 // and SAML logins. Must work for all user types (including supervised).
475 MediaStreamDevicesController::RequestPermissions(web_contents, request, 476 MediaStreamDevicesController::RequestPermissions(web_contents, request,
476 callback); 477 callback);
477 } 478 }
478 479
479 bool WebUILoginView::CheckMediaAccessPermission( 480 bool WebUILoginView::CheckMediaAccessPermission(
480 content::WebContents* web_contents, 481 content::WebContents* web_contents,
481 const GURL& security_origin, 482 const GURL& security_origin,
482 content::MediaStreamType type) { 483 content::MediaStreamType type) {
483 return MediaCaptureDevicesDispatcher::GetInstance() 484 return MediaCaptureDevicesDispatcher::GetInstance()
484 ->CheckMediaAccessPermission(web_contents, security_origin, type); 485 ->CheckMediaAccessPermission(web_contents, security_origin, type);
(...skipping 18 matching lines...) Expand all
503 if (should_emit_login_prompt_visible_) { 504 if (should_emit_login_prompt_visible_) {
504 VLOG(1) << "Login WebUI >> login-prompt-visible"; 505 VLOG(1) << "Login WebUI >> login-prompt-visible";
505 chromeos::DBusThreadManager::Get()->GetSessionManagerClient()-> 506 chromeos::DBusThreadManager::Get()->GetSessionManagerClient()->
506 EmitLoginPromptVisible(); 507 EmitLoginPromptVisible();
507 } 508 }
508 509
509 webui_visible_ = true; 510 webui_visible_ = true;
510 } 511 }
511 512
512 } // namespace chromeos 513 } // 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