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

Unified Diff: chrome/browser/chromeos/login/ui/login_display_host_impl.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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/login/ui/login_display_host_impl.cc
diff --git a/chrome/browser/chromeos/login/ui/login_display_host_impl.cc b/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
index 9abe6210051e4d9f23379242e4d3262872adaab5..1631746f17fb1796addde90005e891cb3ea9b27a 100644
--- a/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
+++ b/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
@@ -41,7 +41,7 @@
#include "chrome/browser/chromeos/login/existing_user_controller.h"
#include "chrome/browser/chromeos/login/helper.h"
#include "chrome/browser/chromeos/login/login_wizard.h"
-#include "chrome/browser/chromeos/login/screens/core_oobe_actor.h"
+#include "chrome/browser/chromeos/login/screens/core_oobe_view.h"
#include "chrome/browser/chromeos/login/signin/token_handle_util.h"
#include "chrome/browser/chromeos/login/startup_utils.h"
#include "chrome/browser/chromeos/login/ui/input_events_blocker.h"
@@ -1024,11 +1024,11 @@ void LoginDisplayHostImpl::OnKeyboardBoundsChanging(
if (new_bounds.IsEmpty()) {
// Keyboard has been hidden.
if (GetOobeUI())
- GetOobeUI()->GetCoreOobeActor()->ShowControlBar(true);
+ GetOobeUI()->GetCoreOobeView()->ShowControlBar(true);
} else if (!new_bounds.IsEmpty()) {
// Keyboard has been shown.
if (GetOobeUI())
- GetOobeUI()->GetCoreOobeActor()->ShowControlBar(false);
+ GetOobeUI()->GetCoreOobeView()->ShowControlBar(false);
}
}
@@ -1055,8 +1055,8 @@ void LoginDisplayHostImpl::OnDisplayMetricsChanged(
if (GetOobeUI()) {
const gfx::Size& size = primary_display.size();
- GetOobeUI()->GetCoreOobeActor()->SetClientAreaSize(size.width(),
- size.height());
+ GetOobeUI()->GetCoreOobeView()->SetClientAreaSize(size.width(),
+ size.height());
}
}
@@ -1329,7 +1329,7 @@ void LoginDisplayHostImpl::OnLoginPromptVisible() {
void LoginDisplayHostImpl::DisableRestrictiveProxyCheckForTest() {
static_cast<chromeos::LoginDisplayHostImpl*>(default_host())
->GetOobeUI()
- ->GetGaiaScreenActor()
+ ->GetGaiaScreenView()
->DisableRestrictiveProxyCheckForTest();
}

Powered by Google App Engine
This is Rietveld 408576698