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

Side by Side Diff: chrome/browser/chromeos/login/lock/webui_screen_locker.cc

Issue 2700303002: cros: Unify oobe View/Actor naming to just View. (Closed)
Patch Set: Rebase 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/lock/webui_screen_locker.h" 5 #include "chrome/browser/chromeos/login/lock/webui_screen_locker.h"
6 6
7 #include "ash/common/wm_shell.h" 7 #include "ash/common/wm_shell.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "ash/system/chromeos/power/power_event_observer.h" 9 #include "ash/system/chromeos/power/power_event_observer.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 413 matching lines...) Expand 10 before | Expand all | Expand 10 after
424 } 424 }
425 425
426 //////////////////////////////////////////////////////////////////////////////// 426 ////////////////////////////////////////////////////////////////////////////////
427 // keyboard::KeyboardControllerObserver: 427 // keyboard::KeyboardControllerObserver:
428 428
429 void WebUIScreenLocker::OnKeyboardBoundsChanging( 429 void WebUIScreenLocker::OnKeyboardBoundsChanging(
430 const gfx::Rect& new_bounds) { 430 const gfx::Rect& new_bounds) {
431 if (new_bounds.IsEmpty()) { 431 if (new_bounds.IsEmpty()) {
432 // Keyboard has been hidden. 432 // Keyboard has been hidden.
433 if (GetOobeUI()) { 433 if (GetOobeUI()) {
434 GetOobeUI()->GetCoreOobeActor()->ShowControlBar(true); 434 GetOobeUI()->GetCoreOobeView()->ShowControlBar(true);
435 GetOobeUI()->GetCoreOobeActor()->ShowPinKeyboard(true); 435 GetOobeUI()->GetCoreOobeView()->ShowPinKeyboard(true);
436 } 436 }
437 } else { 437 } else {
438 // Keyboard has been shown. 438 // Keyboard has been shown.
439 if (GetOobeUI()) { 439 if (GetOobeUI()) {
440 GetOobeUI()->GetCoreOobeActor()->ShowControlBar(false); 440 GetOobeUI()->GetCoreOobeView()->ShowControlBar(false);
441 GetOobeUI()->GetCoreOobeActor()->ShowPinKeyboard(false); 441 GetOobeUI()->GetCoreOobeView()->ShowPinKeyboard(false);
442 } 442 }
443 } 443 }
444 } 444 }
445 445
446 void WebUIScreenLocker::OnKeyboardClosed() {} 446 void WebUIScreenLocker::OnKeyboardClosed() {}
447 447
448 //////////////////////////////////////////////////////////////////////////////// 448 ////////////////////////////////////////////////////////////////////////////////
449 // display::DisplayObserver: 449 // display::DisplayObserver:
450 450
451 void WebUIScreenLocker::OnDisplayAdded(const display::Display& new_display) {} 451 void WebUIScreenLocker::OnDisplayAdded(const display::Display& new_display) {}
452 452
453 void WebUIScreenLocker::OnDisplayRemoved(const display::Display& old_display) {} 453 void WebUIScreenLocker::OnDisplayRemoved(const display::Display& old_display) {}
454 454
455 void WebUIScreenLocker::OnDisplayMetricsChanged(const display::Display& display, 455 void WebUIScreenLocker::OnDisplayMetricsChanged(const display::Display& display,
456 uint32_t changed_metrics) { 456 uint32_t changed_metrics) {
457 display::Display primary_display = 457 display::Display primary_display =
458 display::Screen::GetScreen()->GetPrimaryDisplay(); 458 display::Screen::GetScreen()->GetPrimaryDisplay();
459 if (display.id() != primary_display.id() || 459 if (display.id() != primary_display.id() ||
460 !(changed_metrics & DISPLAY_METRIC_BOUNDS)) { 460 !(changed_metrics & DISPLAY_METRIC_BOUNDS)) {
461 return; 461 return;
462 } 462 }
463 463
464 if (GetOobeUI()) { 464 if (GetOobeUI()) {
465 const gfx::Size& size = primary_display.size(); 465 const gfx::Size& size = primary_display.size();
466 GetOobeUI()->GetCoreOobeActor()->SetClientAreaSize(size.width(), 466 GetOobeUI()->GetCoreOobeView()->SetClientAreaSize(size.width(),
467 size.height()); 467 size.height());
468 } 468 }
469 } 469 }
470 470
471 } // namespace chromeos 471 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698