| 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 <list> | 7 #include <list> |
| 8 #include <map> | 8 #include <map> |
| 9 #include <memory> | 9 #include <memory> |
| 10 | 10 |
| (...skipping 27 matching lines...) Expand all Loading... |
| 38 | 38 |
| 39 syncer::StringOrdinal app_launch_ordinal; | 39 syncer::StringOrdinal app_launch_ordinal; |
| 40 syncer::StringOrdinal page_ordinal; | 40 syncer::StringOrdinal page_ordinal; |
| 41 extensions::LaunchType launch_type; | 41 extensions::LaunchType launch_type; |
| 42 GURL launch_web_url; | 42 GURL launch_web_url; |
| 43 std::string description; | 43 std::string description; |
| 44 std::string name; | 44 std::string name; |
| 45 bool from_bookmark; | 45 bool from_bookmark; |
| 46 }; | 46 }; |
| 47 | 47 |
| 48 typedef std::map<std::string, AppState> AppStateMap; | 48 using AppStateMap = std::map<std::string, AppState>; |
| 49 | 49 |
| 50 AppState::AppState() | 50 AppState::AppState() |
| 51 : launch_type(extensions::LAUNCH_TYPE_INVALID), from_bookmark(false) {} | 51 : launch_type(extensions::LAUNCH_TYPE_INVALID), from_bookmark(false) {} |
| 52 | 52 |
| 53 AppState::~AppState() {} | 53 AppState::~AppState() {} |
| 54 | 54 |
| 55 bool AppState::IsValid() const { | 55 bool AppState::IsValid() const { |
| 56 return page_ordinal.IsValid() && app_launch_ordinal.IsValid(); | 56 return page_ordinal.IsValid() && app_launch_ordinal.IsValid(); |
| 57 } | 57 } |
| 58 | 58 |
| (...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 217 crx_file::id_util::GenerateId(name), app_launch_ordinal); | 217 crx_file::id_util::GenerateId(name), app_launch_ordinal); |
| 218 } | 218 } |
| 219 | 219 |
| 220 void SyncAppHelper::FixNTPOrdinalCollisions(Profile* profile) { | 220 void SyncAppHelper::FixNTPOrdinalCollisions(Profile* profile) { |
| 221 ExtensionSystem::Get(profile)->app_sorting()->FixNTPOrdinalCollisions(); | 221 ExtensionSystem::Get(profile)->app_sorting()->FixNTPOrdinalCollisions(); |
| 222 } | 222 } |
| 223 | 223 |
| 224 SyncAppHelper::SyncAppHelper() : setup_completed_(false) {} | 224 SyncAppHelper::SyncAppHelper() : setup_completed_(false) {} |
| 225 | 225 |
| 226 SyncAppHelper::~SyncAppHelper() {} | 226 SyncAppHelper::~SyncAppHelper() {} |
| OLD | NEW |