Skip to content

GitLab

T
tangled
Commit 34b78c32 authored by Brian Malcolm's avatar Brian Malcolm Committed by Commit Bot
Browse files
Options

NativePrintersExternalDataHandler -> PrintersExternalDataHandler 

BUG=chromium:1113362

Change-Id: I1a3fd4448c706991e25bba434273bd783bdcfea4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2355053
Commit-Queue: Brian Malcolm <bmalcolm@chromium.org>
Reviewed-by: default avatarDenis Kuznetsov [CET] <antrim@chromium.org>
Cr-Commit-Position: refs/heads/master@{#798220}
parent dd0f50cf
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 29 deletions
chrome/browser/chromeos/BUILD.gn
View file @ 34b78c32
......@@ -2072,10 +2072,10 @@ source_set("chromeos") {
"policy/external_data_handlers/device_wallpaper_image_external_data_handler.h",
"policy/external_data_handlers/device_wilco_dtc_configuration_external_data_handler.cc",
"policy/external_data_handlers/device_wilco_dtc_configuration_external_data_handler.h",
"policy/external_data_handlers/native_printers_external_data_handler.cc",
"policy/external_data_handlers/native_printers_external_data_handler.h",
"policy/external_data_handlers/print_servers_external_data_handler.cc",
"policy/external_data_handlers/print_servers_external_data_handler.h",
"policy/external_data_handlers/printers_external_data_handler.cc",
"policy/external_data_handlers/printers_external_data_handler.h",
"policy/external_data_handlers/user_avatar_image_external_data_handler.cc",
"policy/external_data_handlers/user_avatar_image_external_data_handler.h",
"policy/external_data_handlers/wallpaper_image_external_data_handler.cc",
......
chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc
View file @ 34b78c32
......@@ -54,8 +54,8 @@
#include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
#include "chrome/browser/chromeos/policy/device_network_configuration_updater.h"
#include "chrome/browser/chromeos/policy/external_data_handlers/crostini_ansible_playbook_external_data_handler.h"
#include "chrome/browser/chromeos/policy/external_data_handlers/native_printers_external_data_handler.h"
#include "chrome/browser/chromeos/policy/external_data_handlers/print_servers_external_data_handler.h"
#include "chrome/browser/chromeos/policy/external_data_handlers/printers_external_data_handler.h"
#include "chrome/browser/chromeos/policy/external_data_handlers/user_avatar_image_external_data_handler.h"
#include "chrome/browser/chromeos/policy/external_data_handlers/wallpaper_image_external_data_handler.h"
#include "chrome/browser/chromeos/policy/user_network_configuration_updater.h"
......@@ -375,7 +375,7 @@ ChromeUserManagerImpl::ChromeUserManagerImpl()
std::make_unique<policy::WallpaperImageExternalDataHandler>(
cros_settings_, device_local_account_policy_service));
cloud_external_data_policy_handlers_.push_back(
std::make_unique<policy::NativePrintersExternalDataHandler>(
std::make_unique<policy::PrintersExternalDataHandler>(
cros_settings_, device_local_account_policy_service));
cloud_external_data_policy_handlers_.push_back(
std::make_unique<policy::PrintServersExternalDataHandler>(
......
chrome/browser/chromeos/policy/external_data_handlers/native_printers_external_data_handler.cc → chrome/browser/chromeos/policy/external_data_handlers/printers_external_data_handler.cc
View file @ 34b78c32
......@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "chrome/browser/chromeos/policy/external_data_handlers/native_printers_external_data_handler.h"
#include "chrome/browser/chromeos/policy/external_data_handlers/printers_external_data_handler.h"
#include <utility>
......@@ -28,20 +28,19 @@ base::WeakPtr<chromeos::BulkPrintersCalculator> GetBulkPrintersCalculator(
} // namespace
NativePrintersExternalDataHandler::NativePrintersExternalDataHandler(
PrintersExternalDataHandler::PrintersExternalDataHandler(
chromeos::CrosSettings* cros_settings,
DeviceLocalAccountPolicyService* policy_service)
: native_printers_observer_(cros_settings,
policy_service,
key::kPrintersBulkConfiguration,
this) {
native_printers_observer_.Init();
: printers_observer_(cros_settings,
policy_service,
key::kPrintersBulkConfiguration,
this) {
printers_observer_.Init();
}
NativePrintersExternalDataHandler::~NativePrintersExternalDataHandler() =
default;
PrintersExternalDataHandler::~PrintersExternalDataHandler() = default;
void NativePrintersExternalDataHandler::OnExternalDataSet(
void PrintersExternalDataHandler::OnExternalDataSet(
const std::string& policy,
const std::string& user_id) {
auto calculator = GetBulkPrintersCalculator(user_id);
......@@ -50,7 +49,7 @@ void NativePrintersExternalDataHandler::OnExternalDataSet(
}
}
void NativePrintersExternalDataHandler::OnExternalDataCleared(
void PrintersExternalDataHandler::OnExternalDataCleared(
const std::string& policy,
const std::string& user_id) {
auto calculator = GetBulkPrintersCalculator(user_id);
......@@ -59,7 +58,7 @@ void NativePrintersExternalDataHandler::OnExternalDataCleared(
}
}
void NativePrintersExternalDataHandler::OnExternalDataFetched(
void PrintersExternalDataHandler::OnExternalDataFetched(
const std::string& policy,
const std::string& user_id,
std::unique_ptr<std::string> data,
......@@ -70,7 +69,7 @@ void NativePrintersExternalDataHandler::OnExternalDataFetched(
}
}
void NativePrintersExternalDataHandler::RemoveForAccountId(
void PrintersExternalDataHandler::RemoveForAccountId(
const AccountId& account_id) {
auto* factory = chromeos::BulkPrintersCalculatorFactory::Get();
if (factory) {
......
chrome/browser/chromeos/policy/external_data_handlers/native_printers_external_data_handler.h → chrome/browser/chromeos/policy/external_data_handlers/printers_external_data_handler.h
View file @ 34b78c32
......@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef CHROME_BROWSER_CHROMEOS_POLICY_EXTERNAL_DATA_HANDLERS_NATIVE_PRINTERS_EXTERNAL_DATA_HANDLER_H_
#define CHROME_BROWSER_CHROMEOS_POLICY_EXTERNAL_DATA_HANDLERS_NATIVE_PRINTERS_EXTERNAL_DATA_HANDLER_H_
#ifndef CHROME_BROWSER_CHROMEOS_POLICY_EXTERNAL_DATA_HANDLERS_PRINTERS_EXTERNAL_DATA_HANDLER_H_
#define CHROME_BROWSER_CHROMEOS_POLICY_EXTERNAL_DATA_HANDLERS_PRINTERS_EXTERNAL_DATA_HANDLER_H_
#include <memory>
#include <string>
......@@ -18,13 +18,15 @@ namespace policy {
class DeviceLocalAccountPolicyService;
class NativePrintersExternalDataHandler
: public CloudExternalDataPolicyHandler {
class PrintersExternalDataHandler : public CloudExternalDataPolicyHandler {
public:
NativePrintersExternalDataHandler(
chromeos::CrosSettings* cros_settings,
DeviceLocalAccountPolicyService* policy_service);
~NativePrintersExternalDataHandler() override;
PrintersExternalDataHandler(chromeos::CrosSettings* cros_settings,
DeviceLocalAccountPolicyService* policy_service);
~PrintersExternalDataHandler() override;
PrintersExternalDataHandler(const PrintersExternalDataHandler&) = delete;
PrintersExternalDataHandler& operator=(const PrintersExternalDataHandler&) =
delete;
// CloudExternalDataPolicyHandler:
void OnExternalDataSet(const std::string& policy,
......@@ -38,11 +40,9 @@ class NativePrintersExternalDataHandler
void RemoveForAccountId(const AccountId& account_id) override;
private:
CloudExternalDataPolicyObserver native_printers_observer_;
DISALLOW_COPY_AND_ASSIGN(NativePrintersExternalDataHandler);
CloudExternalDataPolicyObserver printers_observer_;
};
} // namespace policy
#endif // CHROME_BROWSER_CHROMEOS_POLICY_EXTERNAL_DATA_HANDLERS_NATIVE_PRINTERS_EXTERNAL_DATA_HANDLER_H_
#endif // CHROME_BROWSER_CHROMEOS_POLICY_EXTERNAL_DATA_HANDLERS_PRINTERS_EXTERNAL_DATA_HANDLER_H_
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment