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

Side by Side Diff: trunk/src/chrome/browser/sync/glue/data_type_controller.h

Issue 14985007: Revert 198844 "Move sequenced_task_runner to base/task" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 7 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_GLUE_DATA_TYPE_CONTROLLER_H__ 5 #ifndef CHROME_BROWSER_SYNC_GLUE_DATA_TYPE_CONTROLLER_H__
6 #define CHROME_BROWSER_SYNC_GLUE_DATA_TYPE_CONTROLLER_H__ 6 #define CHROME_BROWSER_SYNC_GLUE_DATA_TYPE_CONTROLLER_H__
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 10
11 #include "base/callback.h" 11 #include "base/callback.h"
12 #include "base/location.h" 12 #include "base/location.h"
13 #include "base/task/sequenced_task_runner_helpers.h" 13 #include "base/sequenced_task_runner_helpers.h"
14 #include "chrome/browser/sync/glue/data_type_error_handler.h" 14 #include "chrome/browser/sync/glue/data_type_error_handler.h"
15 #include "content/public/browser/browser_thread.h" 15 #include "content/public/browser/browser_thread.h"
16 #include "sync/api/sync_merge_result.h" 16 #include "sync/api/sync_merge_result.h"
17 #include "sync/internal_api/public/base/model_type.h" 17 #include "sync/internal_api/public/base/model_type.h"
18 #include "sync/internal_api/public/engine/model_safe_worker.h" 18 #include "sync/internal_api/public/engine/model_safe_worker.h"
19 #include "sync/internal_api/public/util/unrecoverable_error_handler.h" 19 #include "sync/internal_api/public/util/unrecoverable_error_handler.h"
20 20
21 namespace syncer { 21 namespace syncer {
22 class SyncError; 22 class SyncError;
23 } 23 }
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 // UMA and reports to breakpad. 135 // UMA and reports to breakpad.
136 // Virtual for testing purpose. 136 // Virtual for testing purpose.
137 virtual void RecordUnrecoverableError( 137 virtual void RecordUnrecoverableError(
138 const tracked_objects::Location& from_here, 138 const tracked_objects::Location& from_here,
139 const std::string& message); 139 const std::string& message);
140 }; 140 };
141 141
142 } // namespace browser_sync 142 } // namespace browser_sync
143 143
144 #endif // CHROME_BROWSER_SYNC_GLUE_DATA_TYPE_CONTROLLER_H__ 144 #endif // CHROME_BROWSER_SYNC_GLUE_DATA_TYPE_CONTROLLER_H__
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698