Break circular dependency between InitializeDeviceDisablingManager and DeviceDisabledScreen

chrome/browser/chromeos/system/device_disabling_manager.cc

 // Copyright 2014 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/system/device_disabling_manager.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_process_platform_part.h"
 #include "chrome/browser/chromeos/login/existing_user_controller.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/policy/server_backed_device_state.h"
 #include "chrome/browser/chromeos/settings/install_attributes.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/settings/cros_settings_names.h"
 #include "chromeos/settings/cros_settings_provider.h"
 #include "components/policy/core/common/cloud/cloud_policy_constants.h"
 #include "components/prefs/pref_service.h"
 #include "components/user_manager/user_manager.h"
+#include "content/public/browser/browser_thread.h"
+
+using content::BrowserThread;
 
 namespace chromeos {
 namespace system {
 
 DeviceDisablingManager::Observer::~Observer() {
 }
 
 DeviceDisablingManager::Delegate::~Delegate() {
 }
 
@@ skipping 33 matching lines @@
 
   device_disabled_subscription_ = cros_settings_->AddSettingsObserver(
       kDeviceDisabled,
       base::Bind(&DeviceDisablingManager::UpdateFromCrosSettings,
                  weak_factory_.GetWeakPtr()));
   disabled_message_subscription_ = cros_settings_->AddSettingsObserver(
       kDeviceDisabledMessage,
       base::Bind(&DeviceDisablingManager::UpdateFromCrosSettings,
                  weak_factory_.GetWeakPtr()));
 
-  UpdateFromCrosSettings();
+  auto callback =

[emaxx, 2017/04/12 17:05:49]

nit: Storing the callback in a variable seems to be unnecessary.

[Ivan Šandrk, 2017/04/13 13:38:00]

Done. Should I maybe cleanup the code a bit? Use a temporary callback variable
for this call and the previous two?

+      base::BindOnce(&DeviceDisablingManager::UpdateFromCrosSettings,
+                     weak_factory_.GetWeakPtr());
+  BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, callback);

[emaxx, 2017/04/12 17:05:49]

I think the following way of posting tasks is preferable:
base::ThreadTaskRunnerHandle::Get()->PostTask(...)
Then you won't need to depend on the "content::" stuff.

[emaxx, 2017/04/12 17:05:49]

nit: Please add a comment why the deferring is performed here instead of just
calling the function.

[Ivan Šandrk, 2017/04/13 13:37:59]

Done.

[Ivan Šandrk, 2017/04/13 13:38:00]

Done.

 }
 
 void DeviceDisablingManager::CacheDisabledMessageAndNotify(
     const std::string& disabled_message) {
   if (disabled_message == disabled_message_)
     return;
 
   disabled_message_ = disabled_message;
   for (auto& observer : observers_)
     observer.OnDisabledMessageChanged(disabled_message_);
@@ skipping 131 matching lines @@
 
   // Cache the enrollment domain.
   enrollment_domain_ = browser_policy_connector_->GetEnterpriseDomain();
 
   // If no session or login is in progress, show the device disabled screen.
   delegate_->ShowDeviceDisabledScreen();
 }
 
 }  // namespace system
 }  // namespace chromeos