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

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

Issue 2761063002: Move more from WmShell to Shell (Closed)
Patch Set: merge Created 3 years, 9 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/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 447 matching lines...) Expand 10 before | Expand all | Expand 10 after
458 return false; 458 return false;
459 459
460 // Focus is accepted, but the Ash system tray is not available in Mash, so 460 // Focus is accepted, but the Ash system tray is not available in Mash, so
461 // exit early. 461 // exit early.
462 if (ash_util::IsRunningInMash()) 462 if (ash_util::IsRunningInMash())
463 return true; 463 return true;
464 464
465 ash::SystemTray* tray = ash::Shell::GetInstance()->GetPrimarySystemTray(); 465 ash::SystemTray* tray = ash::Shell::GetInstance()->GetPrimarySystemTray();
466 if (tray && tray->GetWidget()->IsVisible()) { 466 if (tray && tray->GetWidget()->IsVisible()) {
467 tray->SetNextFocusableView(this); 467 tray->SetNextFocusableView(this);
468 ash::WmShell::Get()->focus_cycler()->RotateFocus( 468 ash::Shell::Get()->focus_cycler()->RotateFocus(
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) {
(...skipping 29 matching lines...) Expand all
508 if (should_emit_login_prompt_visible_) { 508 if (should_emit_login_prompt_visible_) {
509 VLOG(1) << "Login WebUI >> login-prompt-visible"; 509 VLOG(1) << "Login WebUI >> login-prompt-visible";
510 chromeos::DBusThreadManager::Get()->GetSessionManagerClient()-> 510 chromeos::DBusThreadManager::Get()->GetSessionManagerClient()->
511 EmitLoginPromptVisible(); 511 EmitLoginPromptVisible();
512 } 512 }
513 513
514 webui_visible_ = true; 514 webui_visible_ = true;
515 } 515 }
516 516
517 } // namespace chromeos 517 } // namespace chromeos
OLDNEW
« no previous file with comments | « ash/wm/window_cycle_controller_unittest.cc ('k') | chrome/browser/chromeos/policy/device_local_account_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698