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

Side by Side Diff: components/search_engines/search_engine_data_type_controller.cc

Issue 2388673002: Revert of [Sync] Move //components/sync to the syncer namespace. (patchset #5 id:40001 of https://co (Closed)
Patch Set: Created 4 years, 2 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
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 "components/search_engines/search_engine_data_type_controller.h" 5 #include "components/search_engines/search_engine_data_type_controller.h"
6 6
7 namespace browser_sync { 7 namespace browser_sync {
8 8
9 SearchEngineDataTypeController::SearchEngineDataTypeController( 9 SearchEngineDataTypeController::SearchEngineDataTypeController(
10 const base::Closure& dump_stack, 10 const base::Closure& dump_stack,
11 syncer::SyncClient* sync_client, 11 sync_driver::SyncClient* sync_client,
12 TemplateURLService* template_url_service) 12 TemplateURLService* template_url_service)
13 : UIDataTypeController(syncer::SEARCH_ENGINES, dump_stack, sync_client), 13 : UIDataTypeController(syncer::SEARCH_ENGINES, dump_stack, sync_client),
14 template_url_service_(template_url_service) {} 14 template_url_service_(template_url_service) {}
15 15
16 TemplateURLService::Subscription* 16 TemplateURLService::Subscription*
17 SearchEngineDataTypeController::GetSubscriptionForTesting() { 17 SearchEngineDataTypeController::GetSubscriptionForTesting() {
18 return template_url_subscription_.get(); 18 return template_url_subscription_.get();
19 } 19 }
20 20
21 SearchEngineDataTypeController::~SearchEngineDataTypeController() {} 21 SearchEngineDataTypeController::~SearchEngineDataTypeController() {}
(...skipping 24 matching lines...) Expand all
46 } 46 }
47 47
48 void SearchEngineDataTypeController::OnTemplateURLServiceLoaded() { 48 void SearchEngineDataTypeController::OnTemplateURLServiceLoaded() {
49 DCHECK(CalledOnValidThread()); 49 DCHECK(CalledOnValidThread());
50 DCHECK_EQ(MODEL_STARTING, state_); 50 DCHECK_EQ(MODEL_STARTING, state_);
51 template_url_subscription_.reset(); 51 template_url_subscription_.reset();
52 OnModelLoaded(); 52 OnModelLoaded();
53 } 53 }
54 54
55 } // namespace browser_sync 55 } // namespace browser_sync
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698