cros: Remove CoreOobeHandler::Delegate.

chrome/browser/ui/webui/chromeos/login/oobe_ui.cc

 // Copyright (c) 2012 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/ui/webui/chromeos/login/oobe_ui.h"
 
 #include <stddef.h>
 
 #include <memory>
 
@@ skipping 201 matching lines @@
 
   network_state_informer_ = new NetworkStateInformer();
   network_state_informer_->Init();
 
   js_calls_container = base::MakeUnique<JSCallsContainer>();
 
   auto core_handler =
       base::MakeUnique<CoreOobeHandler>(this, js_calls_container.get());
   core_handler_ = core_handler.get();
   AddWebUIHandler(std::move(core_handler));
-  core_handler_->SetDelegate(this);
 
   auto network_dropdown_handler = base::MakeUnique<NetworkDropdownHandler>();
   network_dropdown_handler_ = network_dropdown_handler.get();
   AddWebUIHandler(std::move(network_dropdown_handler));
 
   AddScreenHandler(base::MakeUnique<UpdateScreenHandler>());
 
   if (display_type_ == kOobeDisplay)
     AddScreenHandler(base::MakeUnique<NetworkScreenHandler>(core_handler_));
 
@@ skipping 88 matching lines @@
   options::UserImageSource* user_image_source =
       new options::UserImageSource();
   content::URLDataSource::Add(profile, user_image_source);
 
   // TabHelper is required for OOBE webui to make webview working on it.
   content::WebContents* contents = web_ui->GetWebContents();
   extensions::TabHelper::CreateForWebContents(contents);
 }
 
 OobeUI::~OobeUI() {
-  core_handler_->SetDelegate(nullptr);
   network_dropdown_handler_->RemoveObserver(GetView<ErrorScreenHandler>());
   if (ash_util::IsRunningInMash()) {
     // TODO: Ash needs to expose screen dimming api. See
     // http://crbug.com/646034.
     NOTIMPLEMENTED();
   }
 }
 
 CoreOobeView* OobeUI::GetCoreOobeView() {
   return core_handler_;
@@ skipping 158 matching lines @@
   }
 
   // Instantiate the ShutdownPolicyHandler.
   shutdown_policy_handler_.reset(
       new ShutdownPolicyHandler(CrosSettings::Get(), this));
 
   // Trigger an initial update.
   shutdown_policy_handler_->NotifyDelegateWithShutdownPolicy();
 }
 
+void OobeUI::OnCurrentScreenChanged(OobeScreen new_screen) {

[achuithb, 2017/03/08 11:32:52]

I assume nothing has changed in this implementation.

[jdufault, 2017/03/09 19:24:14]

Yep, no changes.

+  previous_screen_ = current_screen_;
+
+  const bool should_dim =
+      std::find(std::begin(kDimOverlayScreenIds),
+                std::end(kDimOverlayScreenIds),
+                new_screen) != std::end(kDimOverlayScreenIds);
+  if (!ash_util::IsRunningInMash()) {
+    if (!screen_dimmer_) {
+      screen_dimmer_ = base::MakeUnique<ash::ScreenDimmer>(
+          ash::ScreenDimmer::Container::LOCK_SCREEN);
+    }
+    screen_dimmer_->set_at_bottom(true);
+    screen_dimmer_->SetDimming(should_dim);
+  } else {
+    // TODO: Ash needs to expose screen dimming api. See
+    // http://crbug.com/646034.
+    NOTIMPLEMENTED();
+  }
+
+  current_screen_ = new_screen;
+  for (Observer& observer : observer_list_)
+    observer.OnCurrentScreenChanged(current_screen_, new_screen);
+}
+
 void OobeUI::OnScreenAssetsLoaded(const std::string& async_assets_load_id) {
   DCHECK(!async_assets_load_id.empty());
 
   for (BaseWebUIHandler* handler : webui_handlers_) {
     if (handler->async_assets_load_id() == async_assets_load_id)
       handler->InitializeBase();
   }
 }
 
 bool OobeUI::IsJSReady(const base::Closure& display_is_ready_callback) {
@@ skipping 34 matching lines @@
 
 
 void OobeUI::AddObserver(Observer* observer) {
   observer_list_.AddObserver(observer);
 }
 
 void OobeUI::RemoveObserver(Observer* observer) {
   observer_list_.RemoveObserver(observer);
 }
 
-void OobeUI::OnCurrentScreenChanged(OobeScreen new_screen) {
-  previous_screen_ = current_screen_;
-
-  const bool should_dim =
-      std::find(std::begin(kDimOverlayScreenIds),
-                std::end(kDimOverlayScreenIds),
-                new_screen) != std::end(kDimOverlayScreenIds);
-  if (!ash_util::IsRunningInMash()) {
-    if (!screen_dimmer_) {
-      screen_dimmer_ = base::MakeUnique<ash::ScreenDimmer>(
-          ash::ScreenDimmer::Container::LOCK_SCREEN);
-    }
-    screen_dimmer_->set_at_bottom(true);
-    screen_dimmer_->SetDimming(should_dim);
-  } else {
-    // TODO: Ash needs to expose screen dimming api. See
-    // http://crbug.com/646034.
-    NOTIMPLEMENTED();
-  }
-
-  current_screen_ = new_screen;
-  for (Observer& observer : observer_list_)
-    observer.OnCurrentScreenChanged(current_screen_, new_screen);
-}
-
 void OobeUI::UpdateLocalizedStringsIfNeeded() {
   if (oobe_ui_md_mode_ ==
       g_browser_process->local_state()->GetBoolean(prefs::kOobeMdMode)) {
     return;
   }
 
   base::DictionaryValue localized_strings;
   GetLocalizedStrings(&localized_strings);
   static_cast<CoreOobeView*>(core_handler_)->ReloadContent(localized_strings);
 }
 
 }  // namespace chromeos