diff options
Diffstat (limited to 'chrome/browser')
24 files changed, 22 insertions, 292 deletions
diff --git a/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.cc b/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.cc index 0a48afb7..b9043e1 100644 --- a/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.cc +++ b/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.cc @@ -15,7 +15,6 @@ #include "base/strings/string_util.h" #include "base/values.h" #include "chrome/browser/chromeos/policy/login_screen_power_management_policy.h" -#include "chrome/browser/policy/policy_error_map.h" #include "chrome/browser/ui/ash/chrome_launcher_prefs.h" #include "chrome/common/pref_names.h" #include "chromeos/dbus/power_policy_controller.h" @@ -23,6 +22,7 @@ #include "chromeos/network/onc/onc_utils.h" #include "chromeos/network/onc/onc_validator.h" #include "components/onc/onc_constants.h" +#include "components/policy/core/browser/policy_error_map.h" #include "components/policy/core/common/external_data_fetcher.h" #include "components/policy/core/common/policy_map.h" #include "grit/component_strings.h" diff --git a/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos_unittest.cc b/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos_unittest.cc index 2458338..21cd13d 100644 --- a/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos_unittest.cc +++ b/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos_unittest.cc @@ -7,9 +7,9 @@ #include "base/callback.h" #include "base/prefs/pref_value_map.h" #include "base/values.h" -#include "chrome/browser/policy/policy_error_map.h" #include "chrome/browser/ui/ash/chrome_launcher_prefs.h" #include "chrome/common/pref_names.h" +#include "components/policy/core/browser/policy_error_map.h" #include "components/policy/core/common/external_data_fetcher.h" #include "components/policy/core/common/policy_map.h" #include "policy/policy_constants.h" diff --git a/chrome/browser/chromeos/policy/login_profile_policy_provider.cc b/chrome/browser/chromeos/policy/login_profile_policy_provider.cc index e169496f..a852cd1 100644 --- a/chrome/browser/chromeos/policy/login_profile_policy_provider.cc +++ b/chrome/browser/chromeos/policy/login_profile_policy_provider.cc @@ -11,7 +11,7 @@ #include "base/memory/scoped_ptr.h" #include "base/values.h" #include "chrome/browser/chromeos/policy/login_screen_power_management_policy.h" -#include "chrome/browser/policy/policy_error_map.h" +#include "components/policy/core/browser/policy_error_map.h" #include "components/policy/core/common/external_data_fetcher.h" #include "components/policy/core/common/policy_bundle.h" #include "components/policy/core/common/policy_map.h" diff --git a/chrome/browser/chromeos/policy/login_screen_power_management_policy.cc b/chrome/browser/chromeos/policy/login_screen_power_management_policy.cc index 93aad57..57a0cd9 100644 --- a/chrome/browser/chromeos/policy/login_screen_power_management_policy.cc +++ b/chrome/browser/chromeos/policy/login_screen_power_management_policy.cc @@ -8,8 +8,8 @@ #include "base/strings/string_number_conversions.h" #include "base/values.h" #include "chrome/browser/policy/configuration_policy_handler.h" -#include "chrome/browser/policy/policy_error_map.h" #include "chromeos/dbus/power_policy_controller.h" +#include "components/policy/core/browser/policy_error_map.h" #include "grit/component_strings.h" #include "policy/policy_constants.h" diff --git a/chrome/browser/chromeos/policy/login_screen_power_management_policy_unittest.cc b/chrome/browser/chromeos/policy/login_screen_power_management_policy_unittest.cc index b666264..61bcb7c 100644 --- a/chrome/browser/chromeos/policy/login_screen_power_management_policy_unittest.cc +++ b/chrome/browser/chromeos/policy/login_screen_power_management_policy_unittest.cc @@ -4,8 +4,8 @@ #include "chrome/browser/chromeos/policy/login_screen_power_management_policy.h" -#include "chrome/browser/policy/policy_error_map.h" #include "chromeos/dbus/power_policy_controller.h" +#include "components/policy/core/browser/policy_error_map.h" #include "policy/policy_constants.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/extensions/policy_handlers.cc b/chrome/browser/extensions/policy_handlers.cc index d0669b2..005fdc2 100644 --- a/chrome/browser/extensions/policy_handlers.cc +++ b/chrome/browser/extensions/policy_handlers.cc @@ -7,8 +7,8 @@ #include "base/logging.h" #include "base/prefs/pref_value_map.h" #include "chrome/browser/extensions/external_policy_loader.h" -#include "chrome/browser/policy/policy_error_map.h" #include "chrome/common/pref_names.h" +#include "components/policy/core/browser/policy_error_map.h" #include "components/policy/core/common/policy_map.h" #include "extensions/common/extension.h" #include "grit/component_strings.h" diff --git a/chrome/browser/extensions/policy_handlers_unittest.cc b/chrome/browser/extensions/policy_handlers_unittest.cc index 7d14f98..270b2ff 100644 --- a/chrome/browser/extensions/policy_handlers_unittest.cc +++ b/chrome/browser/extensions/policy_handlers_unittest.cc @@ -5,8 +5,8 @@ #include "base/prefs/pref_value_map.h" #include "chrome/browser/extensions/external_policy_loader.h" #include "chrome/browser/extensions/policy_handlers.h" -#include "chrome/browser/policy/policy_error_map.h" #include "chrome/common/pref_names.h" +#include "components/policy/core/browser/policy_error_map.h" #include "components/policy/core/common/policy_map.h" #include "policy/policy_constants.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/net/proxy_policy_handler.cc b/chrome/browser/net/proxy_policy_handler.cc index be01502..9e848b7 100644 --- a/chrome/browser/net/proxy_policy_handler.cc +++ b/chrome/browser/net/proxy_policy_handler.cc @@ -9,10 +9,10 @@ #include "base/strings/string_number_conversions.h" #include "base/values.h" #include "chrome/browser/policy/configuration_policy_handler.h" -#include "chrome/browser/policy/policy_error_map.h" #include "chrome/browser/prefs/proxy_config_dictionary.h" #include "chrome/browser/prefs/proxy_prefs.h" #include "chrome/common/pref_names.h" +#include "components/policy/core/browser/policy_error_map.h" #include "components/policy/core/common/policy_map.h" #include "grit/component_strings.h" #include "policy/policy_constants.h" diff --git a/chrome/browser/policy/configuration_policy_handler.cc b/chrome/browser/policy/configuration_policy_handler.cc index af7ddee..d0341d9 100644 --- a/chrome/browser/policy/configuration_policy_handler.cc +++ b/chrome/browser/policy/configuration_policy_handler.cc @@ -14,7 +14,7 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "chrome/browser/policy/configuration_policy_pref_store.h" -#include "chrome/browser/policy/policy_error_map.h" +#include "components/policy/core/browser/policy_error_map.h" #include "components/policy/core/common/policy_map.h" #include "grit/component_strings.h" #include "url/gurl.h" diff --git a/chrome/browser/policy/configuration_policy_handler_android.cc b/chrome/browser/policy/configuration_policy_handler_android.cc index a900e4a..e5c5d8e 100644 --- a/chrome/browser/policy/configuration_policy_handler_android.cc +++ b/chrome/browser/policy/configuration_policy_handler_android.cc @@ -6,9 +6,9 @@ #include "base/prefs/pref_value_map.h" #include "base/values.h" -#include "chrome/browser/policy/policy_error_map.h" #include "chrome/common/net/url_fixer_upper.h" #include "chrome/common/pref_names.h" +#include "components/policy/core/browser/policy_error_map.h" #include "components/policy/core/common/policy_map.h" #include "grit/component_strings.h" #include "policy/policy_constants.h" diff --git a/chrome/browser/policy/configuration_policy_handler_list.cc b/chrome/browser/policy/configuration_policy_handler_list.cc index 41392b5..a7b503a 100644 --- a/chrome/browser/policy/configuration_policy_handler_list.cc +++ b/chrome/browser/policy/configuration_policy_handler_list.cc @@ -17,13 +17,13 @@ #include "chrome/browser/policy/configuration_policy_handler.h" #include "chrome/browser/policy/file_selection_dialogs_policy_handler.h" #include "chrome/browser/policy/javascript_policy_handler.h" -#include "chrome/browser/policy/policy_error_map.h" #include "chrome/browser/policy/url_blacklist_policy_handler.h" #include "chrome/browser/profiles/incognito_mode_policy_handler.h" #include "chrome/browser/search_engines/default_search_policy_handler.h" #include "chrome/browser/sessions/restore_on_startup_policy_handler.h" #include "chrome/browser/sync/sync_policy_handler.h" #include "chrome/common/pref_names.h" +#include "components/policy/core/browser/policy_error_map.h" #include "components/policy/core/common/policy_details.h" #include "components/policy/core/common/policy_map.h" #include "components/policy/core/common/policy_pref_names.h" diff --git a/chrome/browser/policy/configuration_policy_handler_unittest.cc b/chrome/browser/policy/configuration_policy_handler_unittest.cc index 114569a..d648f12 100644 --- a/chrome/browser/policy/configuration_policy_handler_unittest.cc +++ b/chrome/browser/policy/configuration_policy_handler_unittest.cc @@ -6,7 +6,7 @@ #include "base/memory/scoped_ptr.h" #include "base/prefs/pref_value_map.h" #include "chrome/browser/policy/configuration_policy_handler.h" -#include "chrome/browser/policy/policy_error_map.h" +#include "components/policy/core/browser/policy_error_map.h" #include "components/policy/core/common/policy_map.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/policy/configuration_policy_pref_store.cc b/chrome/browser/policy/configuration_policy_pref_store.cc index fa3afb0..9c5e221 100644 --- a/chrome/browser/policy/configuration_policy_pref_store.cc +++ b/chrome/browser/policy/configuration_policy_pref_store.cc @@ -14,7 +14,7 @@ #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/policy/configuration_policy_handler_list.h" -#include "chrome/browser/policy/policy_error_map.h" +#include "components/policy/core/browser/policy_error_map.h" namespace policy { diff --git a/chrome/browser/policy/javascript_policy_handler.cc b/chrome/browser/policy/javascript_policy_handler.cc index 69d2900..8a4b7e8 100644 --- a/chrome/browser/policy/javascript_policy_handler.cc +++ b/chrome/browser/policy/javascript_policy_handler.cc @@ -6,9 +6,9 @@ #include "base/prefs/pref_value_map.h" #include "base/values.h" -#include "chrome/browser/policy/policy_error_map.h" #include "chrome/common/content_settings.h" #include "chrome/common/pref_names.h" +#include "components/policy/core/browser/policy_error_map.h" #include "components/policy/core/common/policy_map.h" #include "grit/component_strings.h" #include "policy/policy_constants.h" diff --git a/chrome/browser/policy/javascript_policy_handler_unittest.cc b/chrome/browser/policy/javascript_policy_handler_unittest.cc index 778228e..c5b42f5 100644 --- a/chrome/browser/policy/javascript_policy_handler_unittest.cc +++ b/chrome/browser/policy/javascript_policy_handler_unittest.cc @@ -5,9 +5,9 @@ #include "chrome/browser/policy/configuration_policy_pref_store.h" #include "chrome/browser/policy/configuration_policy_pref_store_unittest.h" #include "chrome/browser/policy/javascript_policy_handler.h" -#include "chrome/browser/policy/policy_error_map.h" #include "chrome/common/content_settings.h" #include "chrome/common/pref_names.h" +#include "components/policy/core/browser/policy_error_map.h" #include "components/policy/core/common/policy_map.h" #include "policy/policy_constants.h" diff --git a/chrome/browser/policy/policy_error_map.cc b/chrome/browser/policy/policy_error_map.cc deleted file mode 100644 index ee49b0e..0000000 --- a/chrome/browser/policy/policy_error_map.cc +++ /dev/null @@ -1,168 +0,0 @@ -// 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/policy/policy_error_map.h" - -#include <utility> - -#include "base/strings/string_number_conversions.h" -#include "base/strings/string_util.h" -#include "base/strings/utf_string_conversions.h" -#include "grit/component_strings.h" -#include "ui/base/l10n/l10n_util.h" -#include "ui/base/resource/resource_bundle.h" - -namespace policy { - -struct PolicyErrorMap::PendingError { - PendingError(const std::string& policy, - const std::string& subkey, - int index, - int message_id, - const std::string& replacement) - : policy(policy), - subkey(subkey), - index(index), - message_id(message_id), - has_replacement(true), - replacement(replacement) {} - - PendingError(const std::string& policy, - const std::string& subkey, - int index, - int message_id) - : policy(policy), - subkey(subkey), - index(index), - message_id(message_id), - has_replacement(false) {} - - std::string policy; - std::string subkey; - int index; - int message_id; - bool has_replacement; - std::string replacement; -}; - -PolicyErrorMap::PolicyErrorMap() { -} - -PolicyErrorMap::~PolicyErrorMap() { -} - -bool PolicyErrorMap::IsReady() const { - return ui::ResourceBundle::HasSharedInstance(); -} - -void PolicyErrorMap::AddError(const std::string& policy, int message_id) { - AddError(PendingError(policy, std::string(), -1, message_id)); -} - -void PolicyErrorMap::AddError(const std::string& policy, - const std::string& subkey, - int message_id) { - AddError(PendingError(policy, subkey, -1, message_id)); -} - -void PolicyErrorMap::AddError(const std::string& policy, - int index, - int message_id) { - AddError(PendingError(policy, std::string(), index, message_id)); -} - -void PolicyErrorMap::AddError(const std::string& policy, - int message_id, - const std::string& replacement) { - AddError(PendingError(policy, std::string(), -1, message_id, replacement)); -} - -void PolicyErrorMap::AddError(const std::string& policy, - const std::string& subkey, - int message_id, - const std::string& replacement) { - AddError(PendingError(policy, subkey, -1, message_id, replacement)); -} - -void PolicyErrorMap::AddError(const std::string& policy, - int index, - int message_id, - const std::string& replacement) { - AddError(PendingError(policy, std::string(), index, message_id, replacement)); -} - -string16 PolicyErrorMap::GetErrors(const std::string& policy) { - CheckReadyAndConvert(); - std::pair<const_iterator, const_iterator> range = map_.equal_range(policy); - std::vector<string16> list; - for (const_iterator it = range.first; it != range.second; ++it) - list.push_back(it->second); - return JoinString(list, '\n'); -} - -bool PolicyErrorMap::empty() { - CheckReadyAndConvert(); - return map_.empty(); -} - -size_t PolicyErrorMap::size() { - CheckReadyAndConvert(); - return map_.size(); -} - -PolicyErrorMap::const_iterator PolicyErrorMap::begin() { - CheckReadyAndConvert(); - return map_.begin(); -} - -PolicyErrorMap::const_iterator PolicyErrorMap::end() { - CheckReadyAndConvert(); - return map_.end(); -} - -void PolicyErrorMap::Clear() { - CheckReadyAndConvert(); - map_.clear(); -} - -void PolicyErrorMap::AddError(const PendingError& error) { - if (IsReady()) { - Convert(error); - } else { - pending_.push_back(error); - } -} - -void PolicyErrorMap::Convert(const PendingError& error) { - string16 submessage; - if (error.has_replacement) { - submessage = l10n_util::GetStringFUTF16(error.message_id, - ASCIIToUTF16(error.replacement)); - } else { - submessage = l10n_util::GetStringUTF16(error.message_id); - } - string16 message; - if (!error.subkey.empty()) { - message = l10n_util::GetStringFUTF16(IDS_POLICY_SUBKEY_ERROR, - ASCIIToUTF16(error.subkey), - submessage); - } else if (error.index >= 0) { - message = l10n_util::GetStringFUTF16(IDS_POLICY_LIST_ENTRY_ERROR, - base::IntToString16(error.index), - submessage); - } else { - message = submessage; - } - map_.insert(std::make_pair(error.policy, message)); -} - -void PolicyErrorMap::CheckReadyAndConvert() { - DCHECK(IsReady()); - for (size_t i = 0; i < pending_.size(); ++i) { - Convert(pending_[i]); - } - pending_.clear(); -} - -} // namespace policy diff --git a/chrome/browser/policy/policy_error_map.h b/chrome/browser/policy/policy_error_map.h deleted file mode 100644 index 7c3b06e..0000000 --- a/chrome/browser/policy/policy_error_map.h +++ /dev/null @@ -1,102 +0,0 @@ -// 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. - -#ifndef CHROME_BROWSER_POLICY_POLICY_ERROR_MAP_H_ -#define CHROME_BROWSER_POLICY_POLICY_ERROR_MAP_H_ - -#include <map> -#include <string> -#include <vector> - -#include "base/basictypes.h" -#include "base/strings/string16.h" - -namespace policy { - -// Collects error messages and their associated policies. -class PolicyErrorMap { - public: - typedef std::multimap<std::string, string16> PolicyMapType; - typedef PolicyMapType::const_iterator const_iterator; - - PolicyErrorMap(); - virtual ~PolicyErrorMap(); - - // Returns true when the errors logged are ready to be retrieved. It is always - // safe to call AddError, but the other methods are only allowed once - // IsReady is true. IsReady will be true once the UI message loop has started. - bool IsReady() const; - - // Adds an entry with key |policy| and the error message corresponding to - // |message_id| in grit/generated_resources.h to the map. - void AddError(const std::string& policy, int message_id); - - // Adds an entry with key |policy|, subkey |subkey|, and the error message - // corresponding to |message_id| in grit/generated_resources.h to the map. - void AddError(const std::string& policy, - const std::string& subkey, - int message_id); - - // Adds an entry with key |policy|, list index |index|, and the error message - // corresponding to |message_id| in grit/generated_resources.h to the map. - void AddError(const std::string& policy, - int index, - int message_id); - - // Adds an entry with key |policy| and the error message corresponding to - // |message_id| in grit/generated_resources.h to the map and replaces the - // placeholder within the error message with |replacement_string|. - void AddError(const std::string& policy, - int message_id, - const std::string& replacement_string); - - // Adds an entry with key |policy|, subkey |subkey| and the error message - // corresponding to |message_id| in grit/generated_resources.h to the map. - // Replaces the placeholder in the error message with |replacement_string|. - void AddError(const std::string& policy, - const std::string& subkey, - int message_id, - const std::string& replacement_string); - - // Adds an entry with key |policy|, list index |index| and the error message - // corresponding to |message_id| in grit/generated_resources.h to the map. - // Replaces the placeholder in the error message with |replacement_string|. - void AddError(const std::string& policy, - int index, - int message_id, - const std::string& replacement_string); - - // Returns all the error messages stored for |policy|, separated by a white - // space. Returns an empty string if there are no errors for |policy|. - string16 GetErrors(const std::string& policy); - - bool empty(); - size_t size(); - - const_iterator begin(); - const_iterator end(); - - void Clear(); - - private: - struct PendingError; - - // Maps the error when ready, otherwise adds it to the pending errors list. - void AddError(const PendingError& error); - - // Converts a PendingError into a |map_| entry. - void Convert(const PendingError& error); - - // Converts all pending errors to |map_| entries. - void CheckReadyAndConvert(); - - std::vector<PendingError> pending_; - PolicyMapType map_; - - DISALLOW_COPY_AND_ASSIGN(PolicyErrorMap); -}; - -} // namespace policy - -#endif // CHROME_BROWSER_POLICY_POLICY_ERROR_MAP_H_ diff --git a/chrome/browser/policy/url_blacklist_policy_handler.cc b/chrome/browser/policy/url_blacklist_policy_handler.cc index 8a775c8..f7433e6 100644 --- a/chrome/browser/policy/url_blacklist_policy_handler.cc +++ b/chrome/browser/policy/url_blacklist_policy_handler.cc @@ -7,8 +7,8 @@ #include "base/memory/scoped_ptr.h" #include "base/prefs/pref_value_map.h" #include "base/values.h" -#include "chrome/browser/policy/policy_error_map.h" #include "chrome/common/pref_names.h" +#include "components/policy/core/browser/policy_error_map.h" #include "components/policy/core/common/policy_map.h" #include "grit/component_strings.h" #include "policy/policy_constants.h" diff --git a/chrome/browser/policy/url_blacklist_policy_handler_unittest.cc b/chrome/browser/policy/url_blacklist_policy_handler_unittest.cc index 4886abb..fe1dba3 100644 --- a/chrome/browser/policy/url_blacklist_policy_handler_unittest.cc +++ b/chrome/browser/policy/url_blacklist_policy_handler_unittest.cc @@ -4,9 +4,9 @@ #include "base/memory/scoped_ptr.h" #include "base/prefs/pref_value_map.h" -#include "chrome/browser/policy/policy_error_map.h" #include "chrome/browser/policy/url_blacklist_policy_handler.h" #include "chrome/common/pref_names.h" +#include "components/policy/core/browser/policy_error_map.h" #include "components/policy/core/common/policy_map.h" #include "grit/generated_resources.h" #include "policy/policy_constants.h" diff --git a/chrome/browser/profiles/incognito_mode_policy_handler.cc b/chrome/browser/profiles/incognito_mode_policy_handler.cc index a3006a1..41bedf2 100644 --- a/chrome/browser/profiles/incognito_mode_policy_handler.cc +++ b/chrome/browser/profiles/incognito_mode_policy_handler.cc @@ -8,9 +8,9 @@ #include "base/prefs/pref_value_map.h" #include "base/strings/string_number_conversions.h" #include "base/values.h" -#include "chrome/browser/policy/policy_error_map.h" #include "chrome/browser/prefs/incognito_mode_prefs.h" #include "chrome/common/pref_names.h" +#include "components/policy/core/browser/policy_error_map.h" #include "components/policy/core/common/policy_map.h" #include "grit/component_strings.h" #include "policy/policy_constants.h" diff --git a/chrome/browser/search_engines/default_search_policy_handler.cc b/chrome/browser/search_engines/default_search_policy_handler.cc index c0d1e9b..ae6c0de 100644 --- a/chrome/browser/search_engines/default_search_policy_handler.cc +++ b/chrome/browser/search_engines/default_search_policy_handler.cc @@ -8,10 +8,10 @@ #include "base/stl_util.h" #include "base/strings/string_util.h" #include "chrome/browser/chrome_notification_types.h" -#include "chrome/browser/policy/policy_error_map.h" #include "chrome/browser/search_engines/search_terms_data.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/common/pref_names.h" +#include "components/policy/core/browser/policy_error_map.h" #include "components/policy/core/common/policy_map.h" #include "content/public/browser/notification_service.h" #include "grit/component_strings.h" diff --git a/chrome/browser/sessions/restore_on_startup_policy_handler.cc b/chrome/browser/sessions/restore_on_startup_policy_handler.cc index 13eda2d..cd42ecc 100644 --- a/chrome/browser/sessions/restore_on_startup_policy_handler.cc +++ b/chrome/browser/sessions/restore_on_startup_policy_handler.cc @@ -7,9 +7,9 @@ #include "base/prefs/pref_value_map.h" #include "base/strings/string_number_conversions.h" #include "base/values.h" -#include "chrome/browser/policy/policy_error_map.h" #include "chrome/browser/prefs/session_startup_pref.h" #include "chrome/common/pref_names.h" +#include "components/policy/core/browser/policy_error_map.h" #include "components/policy/core/common/policy_map.h" #include "grit/component_strings.h" #include "policy/policy_constants.h" diff --git a/chrome/browser/sessions/restore_on_startup_policy_handler_unittest.cc b/chrome/browser/sessions/restore_on_startup_policy_handler_unittest.cc index cbdc539..edfb97e 100644 --- a/chrome/browser/sessions/restore_on_startup_policy_handler_unittest.cc +++ b/chrome/browser/sessions/restore_on_startup_policy_handler_unittest.cc @@ -11,10 +11,10 @@ #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/policy/configuration_policy_handler.h" -#include "chrome/browser/policy/policy_error_map.h" #include "chrome/browser/prefs/session_startup_pref.h" #include "chrome/browser/sessions/restore_on_startup_policy_handler.h" #include "chrome/common/pref_names.h" +#include "components/policy/core/browser/policy_error_map.h" #include "components/policy/core/common/policy_map.h" #include "grit/component_strings.h" #include "policy/policy_constants.h" diff --git a/chrome/browser/ui/webui/policy_ui.cc b/chrome/browser/ui/webui/policy_ui.cc index ca7f2bb..17a1bf5 100644 --- a/chrome/browser/ui/webui/policy_ui.cc +++ b/chrome/browser/ui/webui/policy_ui.cc @@ -26,7 +26,6 @@ #include "chrome/browser/policy/cloud/cloud_policy_validator.h" #include "chrome/browser/policy/cloud/message_util.h" #include "chrome/browser/policy/configuration_policy_handler_list.h" -#include "chrome/browser/policy/policy_error_map.h" #include "chrome/browser/policy/policy_service.h" #include "chrome/browser/policy/profile_policy_connector.h" #include "chrome/browser/policy/profile_policy_connector_factory.h" @@ -35,6 +34,7 @@ #include "chrome/browser/policy/schema_registry_service_factory.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/url_constants.h" +#include "components/policy/core/browser/policy_error_map.h" #include "components/policy/core/common/policy_map.h" #include "components/policy/core/common/policy_namespace.h" #include "components/policy/core/common/policy_types.h" |