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

Side by Side Diff: chrome/browser/sync/profile_sync_components_factory_impl.h

Issue 9834056: Moved WebDataService to ProfileKeyedService (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Changed return NULL; to NOTREACHED() Created 8 years, 8 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef CHROME_BROWSER_SYNC_PROFILE_SYNC_COMPONENTS_FACTORY_IMPL_H__ 5 #ifndef CHROME_BROWSER_SYNC_PROFILE_SYNC_COMPONENTS_FACTORY_IMPL_H__
6 #define CHROME_BROWSER_SYNC_PROFILE_SYNC_COMPONENTS_FACTORY_IMPL_H__ 6 #define CHROME_BROWSER_SYNC_PROFILE_SYNC_COMPONENTS_FACTORY_IMPL_H__
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 10
11 #include "base/basictypes.h" 11 #include "base/basictypes.h"
12 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
13 #include "chrome/browser/sync/profile_sync_components_factory.h" 13 #include "chrome/browser/sync/profile_sync_components_factory.h"
14 #include "chrome/browser/webdata/web_data_service.h"
14 15
15 class CommandLine; 16 class CommandLine;
16 class Profile; 17 class Profile;
17 18
18 class ProfileSyncComponentsFactoryImpl : public ProfileSyncComponentsFactory { 19 class ProfileSyncComponentsFactoryImpl : public ProfileSyncComponentsFactory {
19 public: 20 public:
20 ProfileSyncComponentsFactoryImpl(Profile* profile, 21 ProfileSyncComponentsFactoryImpl(Profile* profile,
21 CommandLine* command_line); 22 CommandLine* command_line);
22 virtual ~ProfileSyncComponentsFactoryImpl() {} 23 virtual ~ProfileSyncComponentsFactoryImpl();
23 24
24 virtual void RegisterDataTypes(ProfileSyncService* pss) OVERRIDE; 25 virtual void RegisterDataTypes(ProfileSyncService* pss) OVERRIDE;
25 26
26 virtual browser_sync::DataTypeManager* CreateDataTypeManager( 27 virtual browser_sync::DataTypeManager* CreateDataTypeManager(
27 browser_sync::SyncBackendHost* backend, 28 browser_sync::SyncBackendHost* backend,
28 const browser_sync::DataTypeController::TypeMap* controllers) OVERRIDE; 29 const browser_sync::DataTypeController::TypeMap* controllers) OVERRIDE;
29 30
30 virtual browser_sync::GenericChangeProcessor* CreateGenericChangeProcessor( 31 virtual browser_sync::GenericChangeProcessor* CreateGenericChangeProcessor(
31 ProfileSyncService* profile_sync_service, 32 ProfileSyncService* profile_sync_service,
32 browser_sync::DataTypeErrorHandler* error_handler, 33 browser_sync::DataTypeErrorHandler* error_handler,
(...skipping 22 matching lines...) Expand all
55 ProfileSyncService* profile_sync_service, 56 ProfileSyncService* profile_sync_service,
56 history::HistoryBackend* history_backend, 57 history::HistoryBackend* history_backend,
57 browser_sync::DataTypeErrorHandler* error_handler) OVERRIDE; 58 browser_sync::DataTypeErrorHandler* error_handler) OVERRIDE;
58 virtual SyncComponents CreateSessionSyncComponents( 59 virtual SyncComponents CreateSessionSyncComponents(
59 ProfileSyncService* profile_sync_service, 60 ProfileSyncService* profile_sync_service,
60 browser_sync::DataTypeErrorHandler* error_handler) OVERRIDE; 61 browser_sync::DataTypeErrorHandler* error_handler) OVERRIDE;
61 62
62 private: 63 private:
63 Profile* profile_; 64 Profile* profile_;
64 CommandLine* command_line_; 65 CommandLine* command_line_;
66 scoped_refptr<WebDataService> web_data_service_;
65 67
66 DISALLOW_COPY_AND_ASSIGN(ProfileSyncComponentsFactoryImpl); 68 DISALLOW_COPY_AND_ASSIGN(ProfileSyncComponentsFactoryImpl);
67 }; 69 };
68 70
69 #endif // CHROME_BROWSER_SYNC_PROFILE_SYNC_COMPONENTS_FACTORY_IMPL_H__ 71 #endif // CHROME_BROWSER_SYNC_PROFILE_SYNC_COMPONENTS_FACTORY_IMPL_H__
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698