summaryrefslogtreecommitdiffstats
path: root/chrome/browser/background
diff options
context:
space:
mode:
authorderat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-30 20:21:17 +0000
committerderat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-30 20:21:17 +0000
commit9eec53fe1841f7ae4d5684074fc3118ef66bb943 (patch)
treebb2fe9582ddb8569bcb0b390cc2c45d4e61e30ca /chrome/browser/background
parentd39bf7539abbc238e8e5a73937b9531feeabb530 (diff)
downloadchromium_src-9eec53fe1841f7ae4d5684074fc3118ef66bb943.zip
chromium_src-9eec53fe1841f7ae4d5684074fc3118ef66bb943.tar.gz
chromium_src-9eec53fe1841f7ae4d5684074fc3118ef66bb943.tar.bz2
Move ScopedUserPrefUpdate to base/prefs.
Move this outside of Chrome to enable moving ExtensionPrefs to the top-level extensions/ directory. BUG=313284 TBR=sky@chromium.org Review URL: https://codereview.chromium.org/46073004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@231905 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/background')
-rw-r--r--chrome/browser/background/background_contents_service.cc2
-rw-r--r--chrome/browser/background/background_contents_service_unittest.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/background/background_contents_service.cc b/chrome/browser/background/background_contents_service.cc
index 7129e36..a46e4a1 100644
--- a/chrome/browser/background/background_contents_service.cc
+++ b/chrome/browser/background/background_contents_service.cc
@@ -10,6 +10,7 @@
#include "base/command_line.h"
#include "base/message_loop/message_loop.h"
#include "base/prefs/pref_service.h"
+#include "base/prefs/scoped_user_pref_update.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/time/time.h"
@@ -25,7 +26,6 @@
#include "chrome/browser/notifications/notification.h"
#include "chrome/browser/notifications/notification_delegate.h"
#include "chrome/browser/notifications/notification_ui_manager.h"
-#include "chrome/browser/prefs/scoped_user_pref_update.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/background/background_contents_service_unittest.cc b/chrome/browser/background/background_contents_service_unittest.cc
index a58cfbc..41228c4c 100644
--- a/chrome/browser/background/background_contents_service_unittest.cc
+++ b/chrome/browser/background/background_contents_service_unittest.cc
@@ -8,11 +8,11 @@
#include "base/command_line.h"
#include "base/memory/scoped_ptr.h"
#include "base/prefs/pref_service.h"
+#include "base/prefs/scoped_user_pref_update.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/background/background_contents_service.h"
#include "chrome/browser/background/background_contents_service_factory.h"
#include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/prefs/scoped_user_pref_update.h"
#include "chrome/browser/tab_contents/background_contents.h"
#include "chrome/browser/ui/browser_list.h"
#include "chrome/common/pref_names.h"