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

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

Issue 2119913002: Fix flaky Kiosk browser_tests failing on wrong widget opacity. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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 | « chrome/browser/chromeos/login/kiosk_browsertest.cc ('k') | no next file » | 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/wm_shell.h" 8 #include "ash/common/wm_shell.h"
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/system/tray/system_tray.h" 10 #include "ash/system/tray/system_tray.h"
(...skipping 303 matching lines...) Expand 10 before | Expand all | Expand 10 after
314 void WebUILoginView::OnPostponedShow() { 314 void WebUILoginView::OnPostponedShow() {
315 set_is_hidden(false); 315 set_is_hidden(false);
316 OnLoginPromptVisible(); 316 OnLoginPromptVisible();
317 } 317 }
318 318
319 void WebUILoginView::SetStatusAreaVisible(bool visible) { 319 void WebUILoginView::SetStatusAreaVisible(bool visible) {
320 if (!chrome::IsRunningInMash() && 320 if (!chrome::IsRunningInMash() &&
321 ash::Shell::GetInstance()->HasPrimaryStatusArea()) { 321 ash::Shell::GetInstance()->HasPrimaryStatusArea()) {
322 ash::SystemTray* tray = ash::Shell::GetInstance()->GetPrimarySystemTray(); 322 ash::SystemTray* tray = ash::Shell::GetInstance()->GetPrimarySystemTray();
323 tray->SetVisible(visible); 323 tray->SetVisible(visible);
324 tray->GetWidget()->SetOpacity(visible ? 1.0 : 0.0);
324 if (visible) { 325 if (visible) {
325 // Tray may have been initialized being hidden. 326 // Tray may have been initialized being hidden.
326 tray->GetWidget()->Show(); 327 tray->GetWidget()->Show();
327 } else { 328 } else {
328 tray->GetWidget()->Hide(); 329 tray->GetWidget()->Hide();
329 } 330 }
330 } else { 331 } else {
331 NOTIMPLEMENTED(); 332 NOTIMPLEMENTED();
332 } 333 }
333 } 334 }
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
525 if (should_emit_login_prompt_visible_) { 526 if (should_emit_login_prompt_visible_) {
526 VLOG(1) << "Login WebUI >> login-prompt-visible"; 527 VLOG(1) << "Login WebUI >> login-prompt-visible";
527 chromeos::DBusThreadManager::Get()->GetSessionManagerClient()-> 528 chromeos::DBusThreadManager::Get()->GetSessionManagerClient()->
528 EmitLoginPromptVisible(); 529 EmitLoginPromptVisible();
529 } 530 }
530 531
531 webui_visible_ = true; 532 webui_visible_ = true;
532 } 533 }
533 534
534 } // namespace chromeos 535 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/kiosk_browsertest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698