summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--build/build_config.h7
-rw-r--r--chrome/browser/autofill/personal_data_manager.cc7
-rw-r--r--chrome/browser/prefs/pref_value_store.cc49
-rw-r--r--chrome/browser/prefs/pref_value_store.h9
-rw-r--r--net/base/x509_certificate_openssl.cc6
5 files changed, 7 insertions, 71 deletions
diff --git a/build/build_config.h b/build/build_config.h
index 9597eb4..960be0d 100644
--- a/build/build_config.h
+++ b/build/build_config.h
@@ -68,11 +68,8 @@
// For access to standard POSIXish features, use OS_POSIX instead of a
// more specific macro.
#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_FREEBSD) || \
-<<<<<<< HEAD
- defined(OS_OPENBSD) || defined(OS_SOLARIS) || defined(ANDROID)
-=======
- defined(OS_OPENBSD) || defined(OS_SOLARIS) || defined(OS_NACL)
->>>>>>> chromium.org at r66597
+ defined(OS_OPENBSD) || defined(OS_SOLARIS) || defined(OS_NACL) || \
+ defined(ANDROID)
#define OS_POSIX 1
// Use base::DataPack for name/value pairs.
#define USE_BASE_DATA_PACK 1
diff --git a/chrome/browser/autofill/personal_data_manager.cc b/chrome/browser/autofill/personal_data_manager.cc
index c978aae..b6a99d8 100644
--- a/chrome/browser/autofill/personal_data_manager.cc
+++ b/chrome/browser/autofill/personal_data_manager.cc
@@ -168,17 +168,12 @@ void PersonalDataManager::RemoveObserver(
}
bool PersonalDataManager::ImportFormData(
-<<<<<<< HEAD
- const std::vector<FormStructure*>& form_structures,
- AutoFillManager* autofill_manager) {
+ const std::vector<FormStructure*>& form_structures) {
#ifdef ANDROID
// TODO: Is this the funcionality that tries to create a profile for the user
// based on what they've entered into forms?
return false;
#else
-=======
- const std::vector<FormStructure*>& form_structures) {
->>>>>>> chromium.org at r66597
// Parse the form and construct a profile based on the information that is
// possible to import.
int importable_fields = 0;
diff --git a/chrome/browser/prefs/pref_value_store.cc b/chrome/browser/prefs/pref_value_store.cc
index 53690c4..eddf43a 100644
--- a/chrome/browser/prefs/pref_value_store.cc
+++ b/chrome/browser/prefs/pref_value_store.cc
@@ -43,7 +43,7 @@ PrefValueStore* PrefValueStore::CreatePrefValueStore(
Profile* profile,
bool user_only) {
#ifdef ANDROID
- return new PrefValueStore(NULL, NULL, NULL, NULL, NULL, new DefaultPrefStore());
+ return new PrefValueStore(NULL, NULL, NULL, NULL, NULL, NULL, new DefaultPrefStore());
#else
using policy::ConfigurationPolicyPrefStore;
ConfigurationPolicyPrefStore* managed = NULL;
@@ -67,14 +67,10 @@ PrefValueStore* PrefValueStore::CreatePrefValueStore(
recommended =
ConfigurationPolicyPrefStore::CreateRecommendedPolicyPrefStore();
}
-<<<<<<< HEAD
- return new PrefValueStore(managed, extension, command_line, user,
- recommended, default_store);
-#endif
-=======
+
return new PrefValueStore(managed, device_management, extension,
command_line, user, recommended, default_store);
->>>>>>> chromium.org at r66597
+#endif
}
PrefValueStore::~PrefValueStore() {}
@@ -308,46 +304,7 @@ bool PrefValueStore::GetValueFromStore(
return false;
}
-<<<<<<< HEAD
#ifndef ANDROID
-void PrefValueStore::RefreshPolicyPrefsCompletion(
- PrefStore* new_managed_pref_store,
- PrefStore* new_recommended_pref_store,
- AfterRefreshCallback* callback_pointer) {
- scoped_ptr<AfterRefreshCallback> callback(callback_pointer);
- DictionaryValue* managed_prefs_before(
- pref_stores_[PrefNotifier::MANAGED_STORE]->prefs());
- DictionaryValue* managed_prefs_after(new_managed_pref_store->prefs());
- DictionaryValue* recommended_prefs_before(
- pref_stores_[PrefNotifier::RECOMMENDED_STORE]->prefs());
- DictionaryValue* recommended_prefs_after(new_recommended_pref_store->prefs());
-
- std::vector<std::string> changed_managed_paths;
- managed_prefs_before->GetDifferingPaths(managed_prefs_after,
- &changed_managed_paths);
-
- std::vector<std::string> changed_recommended_paths;
- recommended_prefs_before->GetDifferingPaths(recommended_prefs_after,
- &changed_recommended_paths);
-
- std::vector<std::string> changed_paths(changed_managed_paths.size() +
- changed_recommended_paths.size());
- std::vector<std::string>::iterator last_insert =
- std::merge(changed_managed_paths.begin(),
- changed_managed_paths.end(),
- changed_recommended_paths.begin(),
- changed_recommended_paths.end(),
- changed_paths.begin());
- changed_paths.resize(last_insert - changed_paths.begin());
-
- pref_stores_[PrefNotifier::MANAGED_STORE].reset(new_managed_pref_store);
- pref_stores_[PrefNotifier::RECOMMENDED_STORE].reset(
- new_recommended_pref_store);
- callback->Run(changed_paths);
-}
-
-=======
->>>>>>> chromium.org at r66597
void PrefValueStore::RefreshPolicyPrefsOnFileThread(
BrowserThread::ID calling_thread_id,
PrefStore* new_managed_platform_pref_store,
diff --git a/chrome/browser/prefs/pref_value_store.h b/chrome/browser/prefs/pref_value_store.h
index 8ab6842..d68cdd9 100644
--- a/chrome/browser/prefs/pref_value_store.h
+++ b/chrome/browser/prefs/pref_value_store.h
@@ -164,22 +164,13 @@ class PrefValueStore : public base::RefCountedThreadSafe<PrefValueStore> {
// lifecycle is managed in another thread.
typedef Callback1<std::vector<std::string> >::Type AfterRefreshCallback;
-<<<<<<< HEAD
#ifndef ANDROID
- // Called as a result of a notification of policy change. Triggers a
- // reload of managed preferences from policy from a Task on the FILE
- // thread. The Task will take ownership of the |callback|. |callback| is
- // called with the set of preferences changed by the policy refresh.
- // |callback| is called on the caller's thread as a Task after
- // RefreshPolicyPrefs has returned.
-=======
// Called as a result of a notification of policy change. Triggers a reload of
// managed platform, device management and recommended preferences from policy
// from a Task on the FILE thread. The Task will take ownership of the
// |callback|. |callback| is called with the set of preferences changed by the
// policy refresh. |callback| is called on the caller's thread as a Task
// after RefreshPolicyPrefs has returned.
->>>>>>> chromium.org at r66597
void RefreshPolicyPrefs(AfterRefreshCallback* callback);
#endif
diff --git a/net/base/x509_certificate_openssl.cc b/net/base/x509_certificate_openssl.cc
index f0a3dc1..5da0f67 100644
--- a/net/base/x509_certificate_openssl.cc
+++ b/net/base/x509_certificate_openssl.cc
@@ -384,15 +384,12 @@ void X509Certificate::GetDNSNames(std::vector<std::string>* dns_names) const {
dns_names->push_back(subject_.common_name);
}
-<<<<<<< HEAD
-#ifndef ANDROID
-=======
// static
X509_STORE* X509Certificate::cert_store() {
return Singleton<X509InitSingleton>::get()->store();
}
->>>>>>> chromium.org at r66597
+#ifndef ANDROID
int X509Certificate::Verify(const std::string& hostname,
int flags,
CertVerifyResult* verify_result) const {
@@ -437,7 +434,6 @@ int X509Certificate::Verify(const std::string& hostname,
verify_result->cert_status |= cert_status;
return MapCertStatusToNetError(verify_result->cert_status);
}
-
#endif
// static
generated by cgit v1.1 at 2024-12-22 14:02:25 +0000