summaryrefslogtreecommitdiffstats
path: root/chrome/browser/bookmarks
diff options
context:
space:
mode:
authortfarina <tfarina@chromium.org>2015-06-15 10:52:32 -0700
committerCommit bot <commit-bot@chromium.org>2015-06-15 17:53:13 +0000
commit9daa66ce895537b6f6079f0145e937ca405176cb (patch)
treec1f5a9b5761a9bd3ca11f19ee819268ac905df59 /chrome/browser/bookmarks
parent2ea2c4303f553e3165a7558b9aa9e4b31d17ce2e (diff)
downloadchromium_src-9daa66ce895537b6f6079f0145e937ca405176cb.zip
chromium_src-9daa66ce895537b6f6079f0145e937ca405176cb.tar.gz
chromium_src-9daa66ce895537b6f6079f0145e937ca405176cb.tar.bz2
Move StartupTaskRunnerService into bookmarks namespace.
This was missed in https://chromium.googlesource.com/chromium/src/+/449b50e4c26610c0309fe6fc5159c66f1f5ecca3, when it was moved from chrome/ to components/bookmarks. BUG=485146 R=sky@chromium.org Review URL: https://codereview.chromium.org/1181093004 Cr-Commit-Position: refs/heads/master@{#334404}
Diffstat (limited to 'chrome/browser/bookmarks')
-rw-r--r--chrome/browser/bookmarks/startup_task_runner_service_factory.cc2
-rw-r--r--chrome/browser/bookmarks/startup_task_runner_service_factory.h7
2 files changed, 7 insertions, 2 deletions
diff --git a/chrome/browser/bookmarks/startup_task_runner_service_factory.cc b/chrome/browser/bookmarks/startup_task_runner_service_factory.cc
index 2cf86ed..d252e61 100644
--- a/chrome/browser/bookmarks/startup_task_runner_service_factory.cc
+++ b/chrome/browser/bookmarks/startup_task_runner_service_factory.cc
@@ -8,6 +8,8 @@
#include "components/bookmarks/browser/startup_task_runner_service.h"
#include "components/keyed_service/content/browser_context_dependency_manager.h"
+using bookmarks::StartupTaskRunnerService;
+
StartupTaskRunnerServiceFactory::StartupTaskRunnerServiceFactory()
: BrowserContextKeyedServiceFactory(
"StartupTaskRunnerServiceFactory",
diff --git a/chrome/browser/bookmarks/startup_task_runner_service_factory.h b/chrome/browser/bookmarks/startup_task_runner_service_factory.h
index a1e66a3..75a4738 100644
--- a/chrome/browser/bookmarks/startup_task_runner_service_factory.h
+++ b/chrome/browser/bookmarks/startup_task_runner_service_factory.h
@@ -9,17 +9,20 @@
#include "base/memory/singleton.h"
#include "components/keyed_service/content/browser_context_keyed_service_factory.h"
-class StartupTaskRunnerService;
class PrefRegistrySyncable;
class Profile;
+namespace bookmarks {
+class StartupTaskRunnerService;
+}
+
// Singleton that owns the start-up task runner service.
class StartupTaskRunnerServiceFactory
: public BrowserContextKeyedServiceFactory {
public:
// Returns the instance of StartupTaskRunnerService associated with this
// profile (creating one if none exists).
- static StartupTaskRunnerService* GetForProfile(Profile* profile);
+ static bookmarks::StartupTaskRunnerService* GetForProfile(Profile* profile);
// Returns an instance of the StartupTaskRunnerServiceFactory singleton.
static StartupTaskRunnerServiceFactory* GetInstance();