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

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

Issue 5875005: Cleanup: Remove unneeded includes of notification_service.h.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: put includes in right order Created 10 years 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 9
10 #include "app/l10n_util.h" 10 #include "app/l10n_util.h"
(...skipping 16 matching lines...) Expand all
27 #include "chrome/browser/sync/glue/change_processor.h" 27 #include "chrome/browser/sync/glue/change_processor.h"
28 #include "chrome/browser/sync/glue/data_type_controller.h" 28 #include "chrome/browser/sync/glue/data_type_controller.h"
29 #include "chrome/browser/sync/glue/data_type_manager.h" 29 #include "chrome/browser/sync/glue/data_type_manager.h"
30 #include "chrome/browser/sync/glue/session_data_type_controller.h" 30 #include "chrome/browser/sync/glue/session_data_type_controller.h"
31 #include "chrome/browser/sync/profile_sync_factory.h" 31 #include "chrome/browser/sync/profile_sync_factory.h"
32 #include "chrome/browser/sync/signin_manager.h" 32 #include "chrome/browser/sync/signin_manager.h"
33 #include "chrome/browser/sync/token_migrator.h" 33 #include "chrome/browser/sync/token_migrator.h"
34 #include "chrome/common/chrome_switches.h" 34 #include "chrome/common/chrome_switches.h"
35 #include "chrome/common/net/gaia/gaia_constants.h" 35 #include "chrome/common/net/gaia/gaia_constants.h"
36 #include "chrome/common/notification_details.h" 36 #include "chrome/common/notification_details.h"
37 #include "chrome/common/notification_service.h"
38 #include "chrome/common/notification_source.h" 37 #include "chrome/common/notification_source.h"
39 #include "chrome/common/notification_type.h" 38 #include "chrome/common/notification_type.h"
40 #include "chrome/common/pref_names.h" 39 #include "chrome/common/pref_names.h"
41 #include "chrome/common/time_format.h" 40 #include "chrome/common/time_format.h"
42 #include "grit/generated_resources.h" 41 #include "grit/generated_resources.h"
43 #include "jingle/notifier/communicator/const_communicator.h" 42 #include "jingle/notifier/communicator/const_communicator.h"
44 #include "net/base/cookie_monster.h" 43 #include "net/base/cookie_monster.h"
45 44
46 using browser_sync::ChangeProcessor; 45 using browser_sync::ChangeProcessor;
47 using browser_sync::DataTypeController; 46 using browser_sync::DataTypeController;
(...skipping 1103 matching lines...) Expand 10 before | Expand all | Expand 10 after
1151 // is initialized, all enabled data types are consistent with one 1150 // is initialized, all enabled data types are consistent with one
1152 // another, and no unrecoverable error has transpired. 1151 // another, and no unrecoverable error has transpired.
1153 if (unrecoverable_error_detected_) 1152 if (unrecoverable_error_detected_)
1154 return false; 1153 return false;
1155 1154
1156 if (!data_type_manager_.get()) 1155 if (!data_type_manager_.get())
1157 return false; 1156 return false;
1158 1157
1159 return data_type_manager_->state() == DataTypeManager::CONFIGURED; 1158 return data_type_manager_->state() == DataTypeManager::CONFIGURED;
1160 } 1159 }
OLDNEW
« no previous file with comments | « chrome/browser/sync/glue/preference_change_processor.cc ('k') | chrome/browser/tab_contents/interstitial_page.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698