diff options
author | dconnelly@chromium.org <dconnelly@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-26 13:53:37 +0000 |
---|---|---|
committer | dconnelly@chromium.org <dconnelly@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-26 13:53:37 +0000 |
commit | 23a8cf5cd9e002b27fdb038c44f34faf5ecb6751 (patch) | |
tree | 287c8db5d89332514ed83d61a59c6de4e94cf797 | |
parent | 6b1445545b12abd150153c9573de92992acd855e (diff) | |
download | chromium_src-23a8cf5cd9e002b27fdb038c44f34faf5ecb6751.zip chromium_src-23a8cf5cd9e002b27fdb038c44f34faf5ecb6751.tar.gz chromium_src-23a8cf5cd9e002b27fdb038c44f34faf5ecb6751.tar.bz2 |
Move RegistryDict to components/policy/.
This facilitates the refactoring of chrome/browser/policy into a layered
component.
BUG=271392
Review URL: https://codereview.chromium.org/79063003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@237330 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | chrome/browser/policy/policy_loader_win.cc | 2 | ||||
-rw-r--r-- | chrome/browser/policy/preg_parser_win.cc | 2 | ||||
-rw-r--r-- | chrome/browser/policy/preg_parser_win_unittest.cc | 2 | ||||
-rw-r--r-- | chrome/chrome_browser.gypi | 2 | ||||
-rw-r--r-- | chrome/chrome_tests_unit.gypi | 1 | ||||
-rw-r--r-- | components/components_tests.gyp | 1 | ||||
-rw-r--r-- | components/policy.gypi | 2 | ||||
-rw-r--r-- | components/policy/core/common/registry_dict_win.cc (renamed from chrome/browser/policy/registry_dict_win.cc) | 2 | ||||
-rw-r--r-- | components/policy/core/common/registry_dict_win.h (renamed from chrome/browser/policy/registry_dict_win.h) | 11 | ||||
-rw-r--r-- | components/policy/core/common/registry_dict_win_unittest.cc (renamed from chrome/browser/policy/registry_dict_win_unittest.cc) | 2 |
10 files changed, 14 insertions, 13 deletions
diff --git a/chrome/browser/policy/policy_loader_win.cc b/chrome/browser/policy/policy_loader_win.cc index eb39bce..8d89206 100644 --- a/chrome/browser/policy/policy_loader_win.cc +++ b/chrome/browser/policy/policy_loader_win.cc @@ -29,11 +29,11 @@ #include "base/strings/string_util.h" #include "chrome/browser/policy/policy_load_status.h" #include "chrome/browser/policy/preg_parser_win.h" -#include "chrome/browser/policy/registry_dict_win.h" #include "components/json_schema/json_schema_constants.h" #include "components/policy/core/common/policy_bundle.h" #include "components/policy/core/common/policy_map.h" #include "components/policy/core/common/policy_namespace.h" +#include "components/policy/core/common/registry_dict_win.h" #include "components/policy/core/common/schema.h" namespace schema = json_schema_constants; diff --git a/chrome/browser/policy/preg_parser_win.cc b/chrome/browser/policy/preg_parser_win.cc index cd855d3..a30714a 100644 --- a/chrome/browser/policy/preg_parser_win.cc +++ b/chrome/browser/policy/preg_parser_win.cc @@ -21,7 +21,7 @@ #include "base/sys_byteorder.h" #include "base/values.h" #include "chrome/browser/policy/policy_load_status.h" -#include "chrome/browser/policy/registry_dict_win.h" +#include "components/policy/core/common/registry_dict_win.h" namespace policy { namespace preg_parser { diff --git a/chrome/browser/policy/preg_parser_win_unittest.cc b/chrome/browser/policy/preg_parser_win_unittest.cc index 3d219b5..ede4e97 100644 --- a/chrome/browser/policy/preg_parser_win_unittest.cc +++ b/chrome/browser/policy/preg_parser_win_unittest.cc @@ -11,7 +11,7 @@ #include "base/path_service.h" #include "base/values.h" #include "chrome/browser/policy/policy_load_status.h" -#include "chrome/browser/policy/registry_dict_win.h" +#include "components/policy/core/common/registry_dict_win.h" #include "testing/gtest/include/gtest/gtest.h" namespace policy { diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index fa6de1d..f904c4f 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -1587,8 +1587,6 @@ 'browser/policy/profile_policy_connector.h', 'browser/policy/profile_policy_connector_factory.cc', 'browser/policy/profile_policy_connector_factory.h', - 'browser/policy/registry_dict_win.cc', - 'browser/policy/registry_dict_win.h', 'browser/policy/schema_registry_service.cc', 'browser/policy/schema_registry_service.h', 'browser/policy/schema_registry_service_factory.cc', diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi index 31edbc8..eb7e9c5 100644 --- a/chrome/chrome_tests_unit.gypi +++ b/chrome/chrome_tests_unit.gypi @@ -1135,7 +1135,6 @@ 'browser/policy/policy_statistics_collector_unittest.cc', 'browser/policy/policy_transformations_unittest.cc', 'browser/policy/preg_parser_win_unittest.cc', - 'browser/policy/registry_dict_win_unittest.cc', 'browser/policy/url_blacklist_manager_unittest.cc', 'browser/policy/url_blacklist_policy_handler_unittest.cc', 'browser/predictors/autocomplete_action_predictor_table_unittest.cc', diff --git a/components/components_tests.gyp b/components/components_tests.gyp index 9847b90..e21d2af 100644 --- a/components/components_tests.gyp +++ b/components/components_tests.gyp @@ -177,6 +177,7 @@ 'sources': [ 'policy/core/common/policy_bundle_unittest.cc', 'policy/core/common/policy_map_unittest.cc', + 'policy/core/common/registry_dict_win_unittest.cc', 'policy/core/common/schema_map_unittest.cc', 'policy/core/common/schema_registry_unittest.cc', 'policy/core/common/schema_unittest.cc', diff --git a/components/policy.gypi b/components/policy.gypi index 165c477..a08ba9e 100644 --- a/components/policy.gypi +++ b/components/policy.gypi @@ -35,6 +35,8 @@ 'policy/core/common/policy_switches.cc', 'policy/core/common/policy_switches.h', 'policy/core/common/policy_types.h', + 'policy/core/common/registry_dict_win.cc', + 'policy/core/common/registry_dict_win.h', 'policy/core/common/schema.cc', 'policy/core/common/schema.h', 'policy/core/common/schema_internal.h', diff --git a/chrome/browser/policy/registry_dict_win.cc b/components/policy/core/common/registry_dict_win.cc index 00a5193..7673079 100644 --- a/chrome/browser/policy/registry_dict_win.cc +++ b/components/policy/core/common/registry_dict_win.cc @@ -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/policy/registry_dict_win.h" +#include "components/policy/core/common/registry_dict_win.h" #include "base/json/json_reader.h" #include "base/stl_util.h" diff --git a/chrome/browser/policy/registry_dict_win.h b/components/policy/core/common/registry_dict_win.h index 43abf26..1cce59b 100644 --- a/chrome/browser/policy/registry_dict_win.h +++ b/components/policy/core/common/registry_dict_win.h @@ -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_POLICY_REGISTRY_DICT_WIN_H_ -#define CHROME_BROWSER_POLICY_REGISTRY_DICT_WIN_H_ +#ifndef COMPONENTS_POLICY_CORE_COMMON_REGISTRY_DICT_WIN_H_ +#define COMPONENTS_POLICY_CORE_COMMON_REGISTRY_DICT_WIN_H_ #include <windows.h> @@ -13,6 +13,7 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" +#include "components/policy/policy_export.h" namespace base { class DictionaryValue; @@ -22,14 +23,14 @@ class Value; namespace policy { // A case-insensitive string comparison functor. -struct CaseInsensitiveStringCompare { +struct POLICY_EXPORT CaseInsensitiveStringCompare { bool operator()(const std::string& a, const std::string& b) const; }; // In-memory representation of a registry subtree. Using a // base::DictionaryValue directly seems tempting, but that doesn't handle the // registry's case-insensitive-but-case-preserving semantics properly. -class RegistryDict { +class POLICY_EXPORT RegistryDict { public: typedef std::map<std::string, RegistryDict*, CaseInsensitiveStringCompare> KeyMap; @@ -87,4 +88,4 @@ class RegistryDict { } // namespace policy -#endif // CHROME_BROWSER_POLICY_REGISTRY_DICT_WIN_H_ +#endif // COMPONENTS_POLICY_CORE_COMMON_REGISTRY_DICT_WIN_H_ diff --git a/chrome/browser/policy/registry_dict_win_unittest.cc b/components/policy/core/common/registry_dict_win_unittest.cc index 6f31397..e413b54 100644 --- a/chrome/browser/policy/registry_dict_win_unittest.cc +++ b/components/policy/core/common/registry_dict_win_unittest.cc @@ -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/policy/registry_dict_win.h" +#include "components/policy/core/common/registry_dict_win.h" #include "base/values.h" #include "components/json_schema/json_schema_constants.h" |