Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(196)

Side by Side Diff: chrome/browser/prefs/browser_prefs.cc

Issue 7655019: Migrate Obsolete NotificationsSettings and remove content_settings::NotificationsProvider. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: " Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/prefs/browser_prefs.h" 5 #include "chrome/browser/prefs/browser_prefs.h"
6 6
7 #include "chrome/browser/about_flags.h" 7 #include "chrome/browser/about_flags.h"
8 #include "chrome/browser/autofill/autofill_manager.h" 8 #include "chrome/browser/autofill/autofill_manager.h"
9 #include "chrome/browser/background/background_contents_service.h" 9 #include "chrome/browser/background/background_contents_service.h"
10 #include "chrome/browser/background/background_mode_manager.h" 10 #include "chrome/browser/background/background_mode_manager.h"
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 NewTabUI::RegisterUserPrefs(user_prefs); 156 NewTabUI::RegisterUserPrefs(user_prefs);
157 PluginPrefs::RegisterPrefs(user_prefs); 157 PluginPrefs::RegisterPrefs(user_prefs);
158 PluginsUI::RegisterUserPrefs(user_prefs); 158 PluginsUI::RegisterUserPrefs(user_prefs);
159 ProfileImpl::RegisterUserPrefs(user_prefs); 159 ProfileImpl::RegisterUserPrefs(user_prefs);
160 PromoResourceService::RegisterUserPrefs(user_prefs); 160 PromoResourceService::RegisterUserPrefs(user_prefs);
161 HostContentSettingsMap::RegisterUserPrefs(user_prefs); 161 HostContentSettingsMap::RegisterUserPrefs(user_prefs);
162 DevToolsWindow::RegisterUserPrefs(user_prefs); 162 DevToolsWindow::RegisterUserPrefs(user_prefs);
163 PinnedTabCodec::RegisterUserPrefs(user_prefs); 163 PinnedTabCodec::RegisterUserPrefs(user_prefs);
164 ExtensionPrefs::RegisterUserPrefs(user_prefs); 164 ExtensionPrefs::RegisterUserPrefs(user_prefs);
165 TranslatePrefs::RegisterUserPrefs(user_prefs); 165 TranslatePrefs::RegisterUserPrefs(user_prefs);
166 DesktopNotificationService::RegisterUserPrefs(user_prefs);
167 PrefProxyConfigService::RegisterPrefs(user_prefs); 166 PrefProxyConfigService::RegisterPrefs(user_prefs);
168 #if defined(TOOLKIT_VIEWS) 167 #if defined(TOOLKIT_VIEWS)
169 BrowserActionsContainer::RegisterUserPrefs(user_prefs); 168 BrowserActionsContainer::RegisterUserPrefs(user_prefs);
170 #elif defined(TOOLKIT_GTK) 169 #elif defined(TOOLKIT_GTK)
171 BrowserWindowGtk::RegisterUserPrefs(user_prefs); 170 BrowserWindowGtk::RegisterUserPrefs(user_prefs);
172 #endif 171 #endif
173 #if defined(OS_CHROMEOS) 172 #if defined(OS_CHROMEOS)
174 chromeos::Preferences::RegisterUserPrefs(user_prefs); 173 chromeos::Preferences::RegisterUserPrefs(user_prefs);
175 #endif 174 #endif
176 BackgroundContentsService::RegisterUserPrefs(user_prefs); 175 BackgroundContentsService::RegisterUserPrefs(user_prefs);
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue())); 210 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue()));
212 } 211 }
213 local_state->ClearPref(prefs::kBrowserWindowPlacement); 212 local_state->ClearPref(prefs::kBrowserWindowPlacement);
214 213
215 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 214 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
216 current_version | WINDOWS_PREFS); 215 current_version | WINDOWS_PREFS);
217 } 216 }
218 } 217 }
219 218
220 } // namespace browser 219 } // namespace browser
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698