cros: Unify oobe View/Actor naming to just View.

chrome/browser/chromeos/login/screens/terms_of_service_screen.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/screens/terms_of_service_screen.h"
 
 #include <string>
 #include <utility>
 
 #include "base/location.h"
@@ skipping 10 matching lines @@
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_status.h"
 #include "url/gurl.h"
 
 namespace chromeos {
 
 TermsOfServiceScreen::TermsOfServiceScreen(
     BaseScreenDelegate* base_screen_delegate,
-    TermsOfServiceScreenActor* actor)
+    TermsOfServiceScreenView* view)
     : BaseScreen(base_screen_delegate, OobeScreen::SCREEN_TERMS_OF_SERVICE),
-      actor_(actor) {
-  DCHECK(actor_);
-  if (actor_)
-    actor_->SetDelegate(this);
+      view_(view) {
+  DCHECK(view_);
+  if (view_)
+    view_->SetDelegate(this);
 }
 
 TermsOfServiceScreen::~TermsOfServiceScreen() {
-  if (actor_)
-    actor_->SetDelegate(NULL);
+  if (view_)
+    view_->SetDelegate(NULL);
 }
 
 void TermsOfServiceScreen::Show() {
-  if (!actor_)
+  if (!view_)
     return;
 
   // Set the domain name whose Terms of Service are being shown.
   policy::BrowserPolicyConnectorChromeOS* connector =
       g_browser_process->platform_part()->browser_policy_connector_chromeos();
-  actor_->SetDomain(connector->GetEnterpriseDomain());
+  view_->SetDomain(connector->GetEnterpriseDomain());
 
   // Show the screen.
-  actor_->Show();
+  view_->Show();
 
   // Start downloading the Terms of Service.
   StartDownload();
 }
 
 void TermsOfServiceScreen::Hide() {
-  if (actor_)
-    actor_->Hide();
+  if (view_)
+    view_->Hide();
 }
 
 void TermsOfServiceScreen::OnDecline() {
   Finish(BaseScreenDelegate::TERMS_OF_SERVICE_DECLINED);
 }
 
 void TermsOfServiceScreen::OnAccept() {
   Finish(BaseScreenDelegate::TERMS_OF_SERVICE_ACCEPTED);
 }
 
-void TermsOfServiceScreen::OnActorDestroyed(TermsOfServiceScreenActor* actor) {
-  if (actor_ == actor)
-    actor_ = NULL;
+void TermsOfServiceScreen::OnViewDestroyed(TermsOfServiceScreenView* view) {
+  if (view_ == view)
+    view_ = NULL;
 }
 
 void TermsOfServiceScreen::StartDownload() {
   const PrefService* prefs = ProfileManager::GetActiveUserProfile()->GetPrefs();
   // If an URL from which the Terms of Service can be downloaded has not been
   // set, show an error message to the user.
   std::string terms_of_service_url =
       prefs->GetString(prefs::kTermsOfServiceURL);
   if (terms_of_service_url.empty()) {
-    if (actor_)
-      actor_->OnLoadError();
+    if (view_)
+      view_->OnLoadError();
     return;
   }
 
   // Start downloading the Terms of Service.
   terms_of_service_fetcher_ = net::URLFetcher::Create(
       GURL(terms_of_service_url), net::URLFetcher::GET, this);
   terms_of_service_fetcher_->SetRequestContext(
       g_browser_process->system_request_context());
   // Request a text/plain MIME type as only plain-text Terms of Service are
   // accepted.
   terms_of_service_fetcher_->AddExtraRequestHeader("Accept: text/plain");
   // Retry up to three times if network changes are detected during the
   // download.
   terms_of_service_fetcher_->SetAutomaticallyRetryOnNetworkChanges(3);
   terms_of_service_fetcher_->Start();
 
   // Abort the download attempt if it takes longer than one minute.
   download_timer_.Start(FROM_HERE, base::TimeDelta::FromMinutes(1),
                         this, &TermsOfServiceScreen::OnDownloadTimeout);
 }
 
 void TermsOfServiceScreen::OnDownloadTimeout() {
   // Abort the download attempt.
   terms_of_service_fetcher_.reset();
 
   // Show an error message to the user.
-  if (actor_)
-    actor_->OnLoadError();
+  if (view_)
+    view_->OnLoadError();
 }
 
 void TermsOfServiceScreen::OnURLFetchComplete(const net::URLFetcher* source) {
   if (source != terms_of_service_fetcher_.get()) {
     NOTREACHED() << "Callback from foreign URL fetcher";
     return;
   }
 
   download_timer_.Stop();
 
   // Destroy the fetcher when this method returns.
   std::unique_ptr<net::URLFetcher> fetcher(
       std::move(terms_of_service_fetcher_));
-  if (!actor_)
+  if (!view_)
     return;
 
   std::string terms_of_service;
   std::string mime_type;
   // If the Terms of Service could not be downloaded, do not have a MIME type of
   // text/plain or are empty, show an error message to the user.
   if (!source->GetStatus().is_success() ||
       !source->GetResponseHeaders()->GetMimeType(&mime_type) ||
       mime_type != "text/plain" ||
       !source->GetResponseAsString(&terms_of_service)) {
-    actor_->OnLoadError();
+    view_->OnLoadError();
   } else {
     // If the Terms of Service were downloaded successfully, show them to the
     // user.
-    actor_->OnLoadSuccess(terms_of_service);
+    view_->OnLoadSuccess(terms_of_service);
   }
 }
 
 }  // namespace chromeos