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

Side by Side Diff: chrome/browser/sync/profile_sync_service.cc

Issue 8468023: Move encryption related files from util folder to encryption folder. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: For review. Created 9 years, 1 month 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/profile_sync_service.h" 5 #include "chrome/browser/sync/profile_sync_service.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cstddef> 8 #include <cstddef>
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 25 matching lines...) Expand all
36 #include "chrome/browser/sync/glue/session_data_type_controller.h" 36 #include "chrome/browser/sync/glue/session_data_type_controller.h"
37 #include "chrome/browser/sync/glue/session_model_associator.h" 37 #include "chrome/browser/sync/glue/session_model_associator.h"
38 #include "chrome/browser/sync/glue/typed_url_data_type_controller.h" 38 #include "chrome/browser/sync/glue/typed_url_data_type_controller.h"
39 #include "chrome/browser/sync/internal_api/configure_reason.h" 39 #include "chrome/browser/sync/internal_api/configure_reason.h"
40 #include "chrome/browser/sync/internal_api/sync_manager.h" 40 #include "chrome/browser/sync/internal_api/sync_manager.h"
41 #include "chrome/browser/sync/js/js_arg_list.h" 41 #include "chrome/browser/sync/js/js_arg_list.h"
42 #include "chrome/browser/sync/js/js_event_details.h" 42 #include "chrome/browser/sync/js/js_event_details.h"
43 #include "chrome/browser/sync/profile_sync_factory.h" 43 #include "chrome/browser/sync/profile_sync_factory.h"
44 #include "chrome/browser/sync/signin_manager.h" 44 #include "chrome/browser/sync/signin_manager.h"
45 #include "chrome/browser/sync/sync_global_error.h" 45 #include "chrome/browser/sync/sync_global_error.h"
46 #include "chrome/browser/sync/util/cryptographer.h" 46 #include "chrome/browser/sync/encryption/cryptographer.h"
47 #include "chrome/browser/sync/util/oauth.h" 47 #include "chrome/browser/sync/util/oauth.h"
48 #include "chrome/browser/ui/browser.h" 48 #include "chrome/browser/ui/browser.h"
49 #include "chrome/browser/ui/browser_list.h" 49 #include "chrome/browser/ui/browser_list.h"
50 #include "chrome/browser/ui/browser_window.h" 50 #include "chrome/browser/ui/browser_window.h"
51 #include "chrome/browser/ui/global_error_service.h" 51 #include "chrome/browser/ui/global_error_service.h"
52 #include "chrome/browser/ui/global_error_service_factory.h" 52 #include "chrome/browser/ui/global_error_service_factory.h"
53 #include "chrome/common/chrome_notification_types.h" 53 #include "chrome/common/chrome_notification_types.h"
54 #include "chrome/common/chrome_switches.h" 54 #include "chrome/common/chrome_switches.h"
55 #include "chrome/common/chrome_version_info.h" 55 #include "chrome/common/chrome_version_info.h"
56 #include "chrome/common/net/gaia/gaia_constants.h" 56 #include "chrome/common/net/gaia/gaia_constants.h"
(...skipping 1498 matching lines...) Expand 10 before | Expand all | Expand 10 after
1555 << "Unrecoverable error."; 1555 << "Unrecoverable error.";
1556 } else { 1556 } else {
1557 VLOG(0) << "ConfigureDataTypeManager not invoked because backend is not " 1557 VLOG(0) << "ConfigureDataTypeManager not invoked because backend is not "
1558 << "initialized"; 1558 << "initialized";
1559 } 1559 }
1560 } 1560 }
1561 1561
1562 const FailedDatatypesHandler& ProfileSyncService::failed_datatypes_handler() { 1562 const FailedDatatypesHandler& ProfileSyncService::failed_datatypes_handler() {
1563 return failed_datatypes_handler_; 1563 return failed_datatypes_handler_;
1564 } 1564 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698