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

Side by Side Diff: chrome/browser/sync/glue/search_engine_data_type_controller.cc

Issue 408003002: [Sync] Fix namespace for sync_driver component (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 6 years, 5 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 #include "chrome/browser/sync/glue/search_engine_data_type_controller.h" 5 #include "chrome/browser/sync/glue/search_engine_data_type_controller.h"
6 6
7 #include "base/metrics/histogram.h" 7 #include "base/metrics/histogram.h"
8 #include "chrome/browser/profiles/profile.h" 8 #include "chrome/browser/profiles/profile.h"
9 #include "chrome/browser/search_engines/template_url_service_factory.h" 9 #include "chrome/browser/search_engines/template_url_service_factory.h"
10 #include "chrome/browser/sync/glue/chrome_report_unrecoverable_error.h" 10 #include "chrome/browser/sync/glue/chrome_report_unrecoverable_error.h"
11 #include "chrome/browser/sync/profile_sync_service.h" 11 #include "chrome/browser/sync/profile_sync_service.h"
12 #include "content/public/browser/browser_thread.h" 12 #include "content/public/browser/browser_thread.h"
13 #include "sync/api/syncable_service.h" 13 #include "sync/api/syncable_service.h"
14 14
15 using content::BrowserThread; 15 using content::BrowserThread;
16 16
17 namespace browser_sync { 17 namespace browser_sync {
18 18
19 SearchEngineDataTypeController::SearchEngineDataTypeController( 19 SearchEngineDataTypeController::SearchEngineDataTypeController(
20 SyncApiComponentFactory* sync_factory, 20 sync_driver::SyncApiComponentFactory* sync_factory,
21 Profile* profile, 21 Profile* profile,
22 const DisableTypeCallback& disable_callback) 22 const DisableTypeCallback& disable_callback)
23 : UIDataTypeController( 23 : UIDataTypeController(
24 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI), 24 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI),
25 base::Bind(&ChromeReportUnrecoverableError), 25 base::Bind(&ChromeReportUnrecoverableError),
26 disable_callback, 26 disable_callback,
27 syncer::SEARCH_ENGINES, 27 syncer::SEARCH_ENGINES,
28 sync_factory), 28 sync_factory),
29 profile_(profile) { 29 profile_(profile) {
30 } 30 }
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 } 62 }
63 63
64 void SearchEngineDataTypeController::OnTemplateURLServiceLoaded() { 64 void SearchEngineDataTypeController::OnTemplateURLServiceLoaded() {
65 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 65 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
66 DCHECK_EQ(state_, MODEL_STARTING); 66 DCHECK_EQ(state_, MODEL_STARTING);
67 template_url_subscription_.reset(); 67 template_url_subscription_.reset();
68 OnModelLoaded(); 68 OnModelLoaded();
69 } 69 }
70 70
71 } // namespace browser_sync 71 } // namespace browser_sync
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698