diff options
25 files changed, 39 insertions, 41 deletions
diff --git a/android_webview/browser/aw_autofill_manager_delegate.cc b/android_webview/browser/aw_autofill_manager_delegate.cc index 7d78b8c..46b43ad 100644 --- a/android_webview/browser/aw_autofill_manager_delegate.cc +++ b/android_webview/browser/aw_autofill_manager_delegate.cc @@ -21,7 +21,7 @@ namespace { void HandleReadError(PersistentPrefStore::PrefReadError error) { } -} +} // namespace namespace android_webview { @@ -39,7 +39,7 @@ AwAutofillManagerDelegate::AwAutofillManagerDelegate(bool enabled) { pref_service_builder.WithReadErrorCallback(base::Bind(&HandleReadError)); AwBrowserContext* context = AwContentBrowserClient::GetAwBrowserContext(); - components::UserPrefs::Set(context, + user_prefs::UserPrefs::Set(context, pref_service_builder.Create(pref_registry)); } @@ -58,7 +58,7 @@ bool AwAutofillManagerDelegate::GetSaveFormData() { } PrefService* AwAutofillManagerDelegate::GetPrefs() { - return components::UserPrefs::Get( + return user_prefs::UserPrefs::Get( AwContentBrowserClient::GetAwBrowserContext()); } diff --git a/chrome/browser/bookmarks/bookmark_expanded_state_tracker.cc b/chrome/browser/bookmarks/bookmark_expanded_state_tracker.cc index 2874f22..11facbf 100644 --- a/chrome/browser/bookmarks/bookmark_expanded_state_tracker.cc +++ b/chrome/browser/bookmarks/bookmark_expanded_state_tracker.cc @@ -33,7 +33,7 @@ BookmarkExpandedStateTracker::GetExpandedNodes() { if (!bookmark_model_->loaded()) return nodes; - PrefService* prefs = components::UserPrefs::Get(browser_context_); + PrefService* prefs = user_prefs::UserPrefs::Get(browser_context_); if (!prefs) return nodes; @@ -95,7 +95,7 @@ void BookmarkExpandedStateTracker::BookmarkAllNodesRemoved( } void BookmarkExpandedStateTracker::UpdatePrefs(const Nodes& nodes) { - PrefService* prefs = components::UserPrefs::Get(browser_context_); + PrefService* prefs = user_prefs::UserPrefs::Get(browser_context_); if (!prefs) return; diff --git a/chrome/browser/chromeos/accessibility/magnification_manager_browsertest.cc b/chrome/browser/chromeos/accessibility/magnification_manager_browsertest.cc index 99deefc..8a4daa8d 100644 --- a/chrome/browser/chromeos/accessibility/magnification_manager_browsertest.cc +++ b/chrome/browser/chromeos/accessibility/magnification_manager_browsertest.cc @@ -70,7 +70,7 @@ Profile* profile() { } PrefService* prefs() { - return components::UserPrefs::Get(profile()); + return user_prefs::UserPrefs::Get(profile()); } void EnableScreenManagnifierToPref(bool enabled) { diff --git a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc index 988376f..2194703 100644 --- a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc +++ b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc @@ -513,7 +513,7 @@ bool BookmarkManagerPrivateGetSubtreeFunction::RunImpl() { } bool BookmarkManagerPrivateCanEditFunction::RunImpl() { - PrefService* prefs = components::UserPrefs::Get(profile_); + PrefService* prefs = user_prefs::UserPrefs::Get(profile_); SetResult(new base::FundamentalValue( prefs->GetBoolean(prefs::kEditBookmarksEnabled))); return true; diff --git a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_apitest.cc b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_apitest.cc index 9f86f22..102ced9 100644 --- a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_apitest.cc +++ b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_apitest.cc @@ -45,7 +45,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, BookmarkManagerEditDisabled) { model->AddURL(bar, 1, ASCIIToUTF16("AAA"), GURL("http://aaa.example.com")); model->AddURL(folder, 0, ASCIIToUTF16("BBB"), GURL("http://bbb.example.com")); - PrefService* prefs = components::UserPrefs::Get(profile); + PrefService* prefs = user_prefs::UserPrefs::Get(profile); prefs->SetBoolean(prefs::kEditBookmarksEnabled, false); ASSERT_TRUE(RunComponentExtensionTest("bookmark_manager/edit_disabled")) diff --git a/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc b/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc index 44fb593..0336c98 100644 --- a/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc +++ b/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc @@ -117,7 +117,7 @@ bool BookmarksFunction::GetBookmarkIdAsInt64(const std::string& id_string, } bool BookmarksFunction::EditBookmarksEnabled() { - PrefService* prefs = components::UserPrefs::Get(profile_); + PrefService* prefs = user_prefs::UserPrefs::Get(profile_); if (prefs->GetBoolean(prefs::kEditBookmarksEnabled)) return true; error_ = keys::kEditBookmarksDisabled; @@ -436,7 +436,7 @@ bool BookmarksSearchFunction::RunImpl() { bookmarks::Search::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params.get()); - PrefService* prefs = components::UserPrefs::Get(profile_); + PrefService* prefs = user_prefs::UserPrefs::Get(profile_); std::string lang = prefs->GetString(prefs::kAcceptLanguages); std::vector<const BookmarkNode*> nodes; bookmark_utils::GetBookmarksContainingText( diff --git a/chrome/browser/profiles/off_the_record_profile_impl.cc b/chrome/browser/profiles/off_the_record_profile_impl.cc index e5b72dd..1212b87 100644 --- a/chrome/browser/profiles/off_the_record_profile_impl.cc +++ b/chrome/browser/profiles/off_the_record_profile_impl.cc @@ -90,7 +90,7 @@ OffTheRecordProfileImpl::OffTheRecordProfileImpl(Profile* real_profile) zoom_callback_(base::Bind(&OffTheRecordProfileImpl::OnZoomLevelChanged, base::Unretained(this))) { // Register on BrowserContext. - components::UserPrefs::Set(this, prefs_); + user_prefs::UserPrefs::Set(this, prefs_); } void OffTheRecordProfileImpl::Init() { diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc index fca6eb8..4ae0c4e 100644 --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc @@ -413,7 +413,7 @@ ProfileImpl::ProfileImpl( pref_registry_, async_prefs)); // Register on BrowserContext. - components::UserPrefs::Set(this, prefs_.get()); + user_prefs::UserPrefs::Set(this, prefs_.get()); } startup_metric_utils::ScopedSlowStartupUMA diff --git a/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.cc b/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.cc index e0821df..d2703c3 100644 --- a/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.cc +++ b/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.cc @@ -265,7 +265,7 @@ void BookmarkContextMenuController::ExecuteCommand(int id, int event_flags) { } bool BookmarkContextMenuController::IsCommandIdChecked(int command_id) const { - PrefService* prefs = components::UserPrefs::Get(profile_); + PrefService* prefs = user_prefs::UserPrefs::Get(profile_); if (command_id == IDC_BOOKMARK_BAR_ALWAYS_SHOW) return prefs->GetBoolean(prefs::kShowBookmarkBar); @@ -278,7 +278,7 @@ bool BookmarkContextMenuController::IsCommandIdEnabled(int command_id) const { if (IsPlatformCommandIdEnabled(command_id, &enabled)) return enabled; - PrefService* prefs = components::UserPrefs::Get(profile_); + PrefService* prefs = user_prefs::UserPrefs::Get(profile_); bool is_root_node = selection_.size() == 1 && selection_[0]->parent() == model_->root_node(); diff --git a/chrome/browser/ui/bookmarks/bookmark_utils.cc b/chrome/browser/ui/bookmarks/bookmark_utils.cc index 20e7675..d11ce6e 100644 --- a/chrome/browser/ui/bookmarks/bookmark_utils.cc +++ b/chrome/browser/ui/bookmarks/bookmark_utils.cc @@ -250,7 +250,7 @@ void GetURLAndTitleToBookmark(content::WebContents* web_contents, } void ToggleBookmarkBarWhenVisible(content::BrowserContext* browser_context) { - PrefService* prefs = components::UserPrefs::Get(browser_context); + PrefService* prefs = user_prefs::UserPrefs::Get(browser_context); const bool always_show = !prefs->GetBoolean(prefs::kShowBookmarkBar); // The user changed when the bookmark bar is shown, update the preferences. diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.mm index c2f2729..7ad2c7b 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.mm @@ -71,7 +71,7 @@ if (node_) { [self setInitialName:base::SysUTF16ToNSString(node_->GetTitle())]; PrefService* prefs = [self profile] ? - components::UserPrefs::Get([self profile]) : + user_prefs::UserPrefs::Get([self profile]) : NULL; string16 urlString = chrome::FormatBookmarkURLForDisplay(node_->url(), prefs); diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.cc index 3f39484..a4e2f14 100644 --- a/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.cc +++ b/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.cc @@ -360,9 +360,8 @@ void BookmarkEditorGtk::Init(GtkWindow* parent_window) { GtkWidget* table; if (details_.GetNodeType() != BookmarkNode::FOLDER) { url_entry_ = gtk_entry_new(); - PrefService* prefs = profile_ ? - components::UserPrefs::Get(profile_) : - NULL; + PrefService* prefs = + profile_ ? user_prefs::UserPrefs::Get(profile_) : NULL; gtk_entry_set_text( GTK_ENTRY(url_entry_), UTF16ToUTF8(chrome::FormatBookmarkURLForDisplay(url, prefs)).c_str()); diff --git a/chrome/browser/ui/views/bookmarks/bookmark_drag_drop_views.cc b/chrome/browser/ui/views/bookmarks/bookmark_drag_drop_views.cc index fb119cb..2959168 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_drag_drop_views.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_drag_drop_views.cc @@ -53,7 +53,7 @@ void DragBookmarks(Profile* profile, int GetBookmarkDragOperation(content::BrowserContext* browser_context, const BookmarkNode* node) { - PrefService* prefs = components::UserPrefs::Get(browser_context); + PrefService* prefs = user_prefs::UserPrefs::Get(browser_context); int move = ui::DragDropTypes::DRAG_MOVE; if (!prefs->GetBoolean(prefs::kEditBookmarksEnabled)) diff --git a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc index d1776ab..c87711f 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc @@ -331,9 +331,8 @@ void BookmarkEditorView::Init() { l10n_util::GetStringUTF16(IDS_BOOKMARK_EDITOR_URL_LABEL)); url_tf_ = new views::Textfield; - PrefService* prefs = profile_ ? - components::UserPrefs::Get(profile_) : - NULL; + PrefService* prefs = + profile_ ? user_prefs::UserPrefs::Get(profile_) : NULL; url_tf_->SetText(chrome::FormatBookmarkURLForDisplay(url, prefs)); url_tf_->SetController(this); url_tf_->SetAccessibleName(url_label_->text()); diff --git a/chrome/browser/ui/views/home_button.cc b/chrome/browser/ui/views/home_button.cc index daba6e5..c0d6a4e 100644 --- a/chrome/browser/ui/views/home_button.cc +++ b/chrome/browser/ui/views/home_button.cc @@ -114,7 +114,7 @@ void HomePageUndoBubble::Init() { } void HomePageUndoBubble::LinkClicked(views::Link* source, int event_flags) { - PrefService* prefs = components::UserPrefs::Get(browser_->profile()); + PrefService* prefs = user_prefs::UserPrefs::Get(browser_->profile()); prefs->SetBoolean(prefs::kHomePageIsNewTabPage, undo_value_is_ntp_); prefs->SetString(prefs::kHomePage, undo_url_.spec()); diff --git a/chrome/browser/ui/webui/options/preferences_browsertest.cc b/chrome/browser/ui/webui/options/preferences_browsertest.cc index d98b7af..dab5306 100644 --- a/chrome/browser/ui/webui/options/preferences_browsertest.cc +++ b/chrome/browser/ui/webui/options/preferences_browsertest.cc @@ -91,7 +91,7 @@ void PreferencesBrowserTest::SetUpPrefs() { ASSERT_TRUE(web_contents); render_view_host_ = web_contents->GetRenderViewHost(); ASSERT_TRUE(render_view_host_); - pref_change_registrar_.Init(components::UserPrefs::Get(browser()->profile())); + pref_change_registrar_.Init(user_prefs::UserPrefs::Get(browser()->profile())); pref_service_ = browser()->profile()->GetPrefs(); ASSERT_TRUE(content::ExecuteScript(render_view_host_, "function TestEnv() {" diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc index b3ad1cd..466191e 100644 --- a/chrome/test/base/testing_profile.cc +++ b/chrome/test/base/testing_profile.cc @@ -288,7 +288,7 @@ void TestingProfile::Init() { EnsureBrowserContextKeyedServiceFactoriesBuilt(); if (prefs_.get()) - components::UserPrefs::Set(this, prefs_.get()); + user_prefs::UserPrefs::Set(this, prefs_.get()); else CreateTestingPrefService(); @@ -559,7 +559,7 @@ void TestingProfile::CreateTestingPrefService() { DCHECK(!prefs_.get()); testing_prefs_ = new TestingPrefServiceSyncable(); prefs_.reset(testing_prefs_); - components::UserPrefs::Set(this, prefs_.get()); + user_prefs::UserPrefs::Set(this, prefs_.get()); chrome::RegisterUserPrefs(testing_prefs_->registry()); } diff --git a/components/autofill/browser/autocomplete_history_manager.cc b/components/autofill/browser/autocomplete_history_manager.cc index 53cf8f9..2f6ce63 100644 --- a/components/autofill/browser/autocomplete_history_manager.cc +++ b/components/autofill/browser/autocomplete_history_manager.cc @@ -52,7 +52,7 @@ AutocompleteHistoryManager::AutocompleteHistoryManager( external_delegate_(NULL) { autofill_enabled_.Init( prefs::kAutofillEnabled, - components::UserPrefs::Get(browser_context_)); + user_prefs::UserPrefs::Get(browser_context_)); } AutocompleteHistoryManager::~AutocompleteHistoryManager() { diff --git a/components/autofill/browser/autofill_common_test.cc b/components/autofill/browser/autofill_common_test.cc index 1b9f16d..cb60e39 100644 --- a/components/autofill/browser/autofill_common_test.cc +++ b/components/autofill/browser/autofill_common_test.cc @@ -151,7 +151,7 @@ void DisableSystemServices(Profile* profile) { // Disable auxiliary profiles for unit testing. These reach out to system // services on the Mac. if (profile) { - components::UserPrefs::Get(profile)->SetBoolean( + user_prefs::UserPrefs::Get(profile)->SetBoolean( prefs::kAutofillAuxiliaryProfilesEnabled, false); } } diff --git a/components/autofill/browser/autofill_download.cc b/components/autofill/browser/autofill_download.cc index cac6ae9..c2e8706 100644 --- a/components/autofill/browser/autofill_download.cc +++ b/components/autofill/browser/autofill_download.cc @@ -80,7 +80,7 @@ AutofillDownloadManager::AutofillDownloadManager(BrowserContext* context, negative_upload_rate_(0), fetcher_id_for_unittest_(0) { DCHECK(observer_); - PrefService* preferences = components::UserPrefs::Get(browser_context_); + PrefService* preferences = user_prefs::UserPrefs::Get(browser_context_); positive_upload_rate_ = preferences->GetDouble(prefs::kAutofillPositiveUploadRate); negative_upload_rate_ = @@ -170,7 +170,7 @@ void AutofillDownloadManager::SetPositiveUploadRate(double rate) { positive_upload_rate_ = rate; DCHECK_GE(rate, 0.0); DCHECK_LE(rate, 1.0); - PrefService* preferences = components::UserPrefs::Get(browser_context_); + PrefService* preferences = user_prefs::UserPrefs::Get(browser_context_); preferences->SetDouble(prefs::kAutofillPositiveUploadRate, rate); } @@ -180,7 +180,7 @@ void AutofillDownloadManager::SetNegativeUploadRate(double rate) { negative_upload_rate_ = rate; DCHECK_GE(rate, 0.0); DCHECK_LE(rate, 1.0); - PrefService* preferences = components::UserPrefs::Get(browser_context_); + PrefService* preferences = user_prefs::UserPrefs::Get(browser_context_); preferences->SetDouble(prefs::kAutofillNegativeUploadRate, rate); } diff --git a/components/autofill/browser/autofill_manager_unittest.cc b/components/autofill/browser/autofill_manager_unittest.cc index 1ee3fd7..769575c 100644 --- a/components/autofill/browser/autofill_manager_unittest.cc +++ b/components/autofill/browser/autofill_manager_unittest.cc @@ -1920,7 +1920,7 @@ TEST_F(AutofillManagerTest, FillAddressForm) { // Test that we correctly fill an address form from an auxiliary profile. TEST_F(AutofillManagerTest, FillAddressFormFromAuxiliaryProfile) { personal_data_.ClearAutofillProfiles(); - PrefService* prefs = components::UserPrefs::Get(profile()); + PrefService* prefs = user_prefs::UserPrefs::Get(profile()); prefs->SetBoolean(::autofill::prefs::kAutofillAuxiliaryProfilesEnabled, true); personal_data_.CreateTestAuxiliaryProfiles(); @@ -2813,7 +2813,7 @@ TEST_F(AutofillManagerTest, FormSubmittedWithDefaultValues) { // Checks that resetting the auxiliary profile enabled preference does the right // thing on all platforms. TEST_F(AutofillManagerTest, AuxiliaryProfilesReset) { - PrefService* prefs = components::UserPrefs::Get(profile()); + PrefService* prefs = user_prefs::UserPrefs::Get(profile()); #if defined(OS_MACOSX) || defined(OS_ANDROID) // Auxiliary profiles is implemented on Mac and Android only. // OSX: enables Mac Address Book integration. diff --git a/components/autofill/browser/personal_data_manager.cc b/components/autofill/browser/personal_data_manager.cc index 531b5e1..6a7fb1f 100644 --- a/components/autofill/browser/personal_data_manager.cc +++ b/components/autofill/browser/personal_data_manager.cc @@ -539,7 +539,7 @@ bool PersonalDataManager::IsDataLoaded() const { } const std::vector<AutofillProfile*>& PersonalDataManager::GetProfiles() { - if (!components::UserPrefs::Get(browser_context_)->GetBoolean( + if (!user_prefs::UserPrefs::Get(browser_context_)->GetBoolean( prefs::kAutofillAuxiliaryProfilesEnabled)) { return web_profiles(); } @@ -692,7 +692,7 @@ void PersonalDataManager::GetCreditCardSuggestions( } bool PersonalDataManager::IsAutofillEnabled() const { - return components::UserPrefs::Get(browser_context_)->GetBoolean( + return user_prefs::UserPrefs::Get(browser_context_)->GetBoolean( prefs::kAutofillEnabled); } diff --git a/components/browser_context_keyed_service/browser_context_keyed_base_factory.cc b/components/browser_context_keyed_service/browser_context_keyed_base_factory.cc index 3276f41..8d134f8 100644 --- a/components/browser_context_keyed_service/browser_context_keyed_base_factory.cc +++ b/components/browser_context_keyed_service/browser_context_keyed_base_factory.cc @@ -73,7 +73,7 @@ void BrowserContextKeyedBaseFactory::RegisterUserPrefsOnBrowserContext( std::set<content::BrowserContext*>::iterator it = registered_preferences_.find(context); if (it == registered_preferences_.end()) { - PrefService* prefs = components::UserPrefs::Get(context); + PrefService* prefs = user_prefs::UserPrefs::Get(context); user_prefs::PrefRegistrySyncable* registry = static_cast<user_prefs::PrefRegistrySyncable*>( prefs->DeprecatedGetPrefRegistry()); diff --git a/components/user_prefs/user_prefs.cc b/components/user_prefs/user_prefs.cc index 73b8ece..8ecdfe4 100644 --- a/components/user_prefs/user_prefs.cc +++ b/components/user_prefs/user_prefs.cc @@ -9,7 +9,7 @@ #include "base/prefs/pref_service.h" #include "content/public/browser/browser_context.h" -namespace components { +namespace user_prefs { namespace { @@ -44,4 +44,4 @@ UserPrefs::UserPrefs(PrefService* prefs) : prefs_(prefs) { UserPrefs::~UserPrefs() { } -} // namespace components +} // namespace user_prefs diff --git a/components/user_prefs/user_prefs.h b/components/user_prefs/user_prefs.h index 3eec9ff..90bf900 100644 --- a/components/user_prefs/user_prefs.h +++ b/components/user_prefs/user_prefs.h @@ -15,7 +15,7 @@ namespace content { class BrowserContext; } -namespace components { +namespace user_prefs { // Components may use preferences associated with a given user. These // hang off of content::BrowserContext and can be retrieved using @@ -43,6 +43,6 @@ class USER_PREFS_EXPORT UserPrefs : public base::SupportsUserData::Data { DISALLOW_COPY_AND_ASSIGN(UserPrefs); }; -} // namespace components +} // namespace user_prefs #endif // COMPONENTS_USER_PREFS_USER_PREFS_H_ |