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

Unified Diff: chrome/browser/ui/webui/chromeos/login/network_screen_handler.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/ui/webui/chromeos/login/network_screen_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc
index 79f1ad636f14a62b5f1c5074a1354c8418165a0f..14819d78df94e561bd403d7b40f7d8b627651dfe 100644
--- a/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc
@@ -20,7 +20,7 @@
#include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
#include "chrome/browser/chromeos/customization/customization_document.h"
#include "chrome/browser/chromeos/idle_detector.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/screens/network_screen.h"
#include "chrome/browser/chromeos/login/ui/input_events_blocker.h"
#include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
@@ -54,10 +54,10 @@ namespace chromeos {
// NetworkScreenHandler, public: -----------------------------------------------
-NetworkScreenHandler::NetworkScreenHandler(CoreOobeActor* core_oobe_actor)
- : core_oobe_actor_(core_oobe_actor) {
+NetworkScreenHandler::NetworkScreenHandler(CoreOobeView* core_oobe_view)
+ : core_oobe_view_(core_oobe_view) {
set_call_js_prefix(kJsScreenPath);
- DCHECK(core_oobe_actor_);
+ DCHECK(core_oobe_view_);
}
NetworkScreenHandler::~NetworkScreenHandler() {
@@ -65,7 +65,7 @@ NetworkScreenHandler::~NetworkScreenHandler() {
screen_->OnViewDestroyed(this);
}
-// NetworkScreenHandler, NetworkScreenActor implementation: --------------------
+// NetworkScreenHandler, NetworkScreenView implementation: ---------------------
void NetworkScreenHandler::Show() {
if (!page_is_ready()) {
@@ -75,13 +75,13 @@ void NetworkScreenHandler::Show() {
PrefService* prefs = g_browser_process->local_state();
if (prefs->GetBoolean(prefs::kFactoryResetRequested)) {
- if (core_oobe_actor_)
- core_oobe_actor_->ShowDeviceResetScreen();
+ if (core_oobe_view_)
+ core_oobe_view_->ShowDeviceResetScreen();
return;
} else if (prefs->GetBoolean(prefs::kDebuggingFeaturesRequested)) {
- if (core_oobe_actor_)
- core_oobe_actor_->ShowEnableDebuggingScreen();
+ if (core_oobe_view_)
+ core_oobe_view_->ShowEnableDebuggingScreen();
return;
}
@@ -98,7 +98,7 @@ void NetworkScreenHandler::Show() {
base::CommandLine::ForCurrentProcess()->HasSwitch(
chromeos::switches::kSystemDevMode));
ShowScreenWithData(OobeScreen::SCREEN_OOBE_NETWORK, &network_screen_params);
- core_oobe_actor_->InitDemoModeDetection();
+ core_oobe_view_->InitDemoModeDetection();
}
void NetworkScreenHandler::Hide() {
@@ -120,11 +120,11 @@ void NetworkScreenHandler::ShowError(const base::string16& message) {
void NetworkScreenHandler::ClearErrors() {
if (page_is_ready())
- core_oobe_actor_->ClearErrors();
+ core_oobe_view_->ClearErrors();
}
void NetworkScreenHandler::StopDemoModeDetection() {
- core_oobe_actor_->StopDemoModeDetection();
+ core_oobe_view_->StopDemoModeDetection();
}
void NetworkScreenHandler::ShowConnectingStatus(
@@ -135,7 +135,7 @@ void NetworkScreenHandler::ShowConnectingStatus(
void NetworkScreenHandler::ReloadLocalizedContent() {
base::DictionaryValue localized_strings;
GetOobeUI()->GetLocalizedStrings(&localized_strings);
- core_oobe_actor_->ReloadContent(localized_strings);
+ core_oobe_view_->ReloadContent(localized_strings);
}
// NetworkScreenHandler, BaseScreenHandler implementation: --------------------
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/network_screen_handler.h ('k') | chrome/browser/ui/webui/chromeos/login/oobe_ui.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698