Chromium Code Reviews| Index: chrome/browser/extensions/chrome_app_sorting.cc |
| diff --git a/chrome/browser/extensions/chrome_app_sorting.cc b/chrome/browser/extensions/chrome_app_sorting.cc |
| index 5f05f47696b6cde21032152affaaf8571da231ec..a11e1a284a01d0432503ac60d9e0f12b96d924c0 100644 |
| --- a/chrome/browser/extensions/chrome_app_sorting.cc |
| +++ b/chrome/browser/extensions/chrome_app_sorting.cc |
| @@ -60,6 +60,10 @@ void ChromeAppSorting::SetExtensionScopedPrefs(ExtensionScopedPrefs* prefs) { |
| extension_scoped_prefs_ = prefs; |
|
not at google - send to devlin
2015/04/23 18:17:14
perhaps add 2 extra checks here, that |extension_s
Matt Giuca
2015/04/24 01:14:14
I don't want to alter this function. One of my the
|
| } |
| +void ChromeAppSorting::CheckExtensionScopedPrefs() const { |
| + CHECK(extension_scoped_prefs_); |
| +} |
| + |
| void ChromeAppSorting::SetExtensionSyncService( |
| ExtensionSyncService* extension_sync_service) { |
| extension_sync_service_ = extension_sync_service; |
| @@ -67,6 +71,7 @@ void ChromeAppSorting::SetExtensionSyncService( |
| void ChromeAppSorting::Initialize( |
| const extensions::ExtensionIdList& extension_ids) { |
| + CHECK(extension_scoped_prefs_); |
|
not at google - send to devlin
2015/04/23 18:17:14
For full debugging goodness, perhaps log |extensio
Matt Giuca
2015/04/24 01:14:14
The crash reports all have 0 extensions, so I assu
|
| InitializePageOrdinalMap(extension_ids); |
| MigrateAppIndex(extension_ids); |
| @@ -470,6 +475,9 @@ syncer::StringOrdinal ChromeAppSorting::GetMinOrMaxAppLaunchOrdinalsOnPage( |
| void ChromeAppSorting::InitializePageOrdinalMap( |
| const extensions::ExtensionIdList& extension_ids) { |
| + // TODO(mgiuca): Added this CHECK to try and diagnose http://crbug.com/476648. |
| + // Remove it after the investigation is concluded. |
| + CHECK(extension_scoped_prefs_); |
|
not at google - send to devlin
2015/04/23 18:17:14
Ditto
|
| for (extensions::ExtensionIdList::const_iterator ext_it = |
| extension_ids.begin(); ext_it != extension_ids.end(); ++ext_it) { |
| AddOrdinalMapping(*ext_it, |