| OLD | NEW |
| 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/test/integration/sync_app_helper.h" | 5 #include "chrome/browser/sync/test/integration/sync_app_helper.h" |
| 6 | 6 |
| 7 #include "chrome/browser/extensions/extension_service.h" | 7 #include "chrome/browser/extensions/extension_service.h" |
| 8 #include "chrome/browser/extensions/extension_system.h" | |
| 9 #include "chrome/browser/extensions/launch_util.h" | 8 #include "chrome/browser/extensions/launch_util.h" |
| 10 #include "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" |
| 11 #include "chrome/browser/sync/test/integration/extensions_helper.h" | 10 #include "chrome/browser/sync/test/integration/extensions_helper.h" |
| 12 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h" | 11 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h" |
| 13 #include "chrome/browser/sync/test/integration/sync_extension_helper.h" | 12 #include "chrome/browser/sync/test/integration/sync_extension_helper.h" |
| 14 #include "chrome/common/extensions/extension_constants.h" | 13 #include "chrome/common/extensions/extension_constants.h" |
| 15 #include "chrome/common/extensions/sync_helper.h" | 14 #include "chrome/common/extensions/sync_helper.h" |
| 16 #include "extensions/browser/app_sorting.h" | 15 #include "extensions/browser/app_sorting.h" |
| 16 #include "extensions/browser/extension_system.h" |
| 17 #include "extensions/common/extension.h" | 17 #include "extensions/common/extension.h" |
| 18 #include "extensions/common/extension_set.h" | 18 #include "extensions/common/extension_set.h" |
| 19 #include "extensions/common/id_util.h" | 19 #include "extensions/common/id_util.h" |
| 20 | 20 |
| 21 namespace { | 21 namespace { |
| 22 | 22 |
| 23 struct AppState { | 23 struct AppState { |
| 24 AppState(); | 24 AppState(); |
| 25 ~AppState(); | 25 ~AppState(); |
| 26 bool IsValid() const; | 26 bool IsValid() const; |
| (...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 184 } | 184 } |
| 185 | 185 |
| 186 void SyncAppHelper::FixNTPOrdinalCollisions(Profile* profile) { | 186 void SyncAppHelper::FixNTPOrdinalCollisions(Profile* profile) { |
| 187 profile->GetExtensionService()->extension_prefs()->app_sorting()-> | 187 profile->GetExtensionService()->extension_prefs()->app_sorting()-> |
| 188 FixNTPOrdinalCollisions(); | 188 FixNTPOrdinalCollisions(); |
| 189 } | 189 } |
| 190 | 190 |
| 191 SyncAppHelper::SyncAppHelper() : setup_completed_(false) {} | 191 SyncAppHelper::SyncAppHelper() : setup_completed_(false) {} |
| 192 | 192 |
| 193 SyncAppHelper::~SyncAppHelper() {} | 193 SyncAppHelper::~SyncAppHelper() {} |
| OLD | NEW |