Call CreateDefaultOrdinals() when needed, instead of on construction

chrome/browser/extensions/extension_sorting.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/extension_sorting.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/prefs/pref_service.h"
@@ skipping 33 matching lines @@
 ExtensionSorting::AppOrdinals::~AppOrdinals() {}
 
 ////////////////////////////////////////////////////////////////////////////////
 // ExtensionSorting
 
 ExtensionSorting::ExtensionSorting(ExtensionScopedPrefs* extension_scoped_prefs,
                                    PrefService* pref_service)
     : extension_scoped_prefs_(extension_scoped_prefs),
       pref_service_(pref_service),
       extension_service_(NULL) {
-  CreateDefaultOrdinals();
 }
 
 ExtensionSorting::~ExtensionSorting() {
 }
 
 void ExtensionSorting::SetExtensionService(
     ExtensionServiceInterface* extension_service) {
   extension_service_ = extension_service;
 }
 
@@ skipping 475 matching lines @@
       // shouldn't so we clear them.
       if (!ext->is_app())
         ClearOrdinals(extension_id);
 
       extension_service_->SyncExtensionChangeIfNeeded(*ext);
     }
   }
 }
 
 void ExtensionSorting::CreateDefaultOrdinals() {
+  static bool s_default_ordinales_created = false;

[csharp, 2013/05/24 18:06:22]

Why isn't this a class variable?

[xiyuan, 2013/05/24 18:09:13]

Right, this needs to be fixed. The flag has to be a member var since we will
have multiple profiles and thus multiple ExtensionSorting.

[stevenjb, 2013/05/24 18:16:02]

Ugh, I've been working too much with statics and am developing bad habits.
Fixed.

+  if (s_default_ordinales_created)
+    return;
+  s_default_ordinales_created = true;
+
   // The following defines the default order of apps.
 #if defined(OS_CHROMEOS)
   std::vector<std::string> app_ids;
   chromeos::default_app_order::Get(&app_ids);
 #else
   const char* kDefaultAppOrder[] = {
     extension_misc::kWebStoreAppId,
   };
   const std::vector<const char*> app_ids(
       kDefaultAppOrder, kDefaultAppOrder + arraysize(kDefaultAppOrder));
 #endif
 
   syncer::StringOrdinal page_ordinal = CreateFirstAppPageOrdinal();
   syncer::StringOrdinal app_launch_ordinal =
       CreateFirstAppLaunchOrdinal(page_ordinal);
   for (size_t i = 0; i < app_ids.size(); ++i) {
     const std::string extension_id = app_ids[i];
     default_ordinals_[extension_id].page_ordinal = page_ordinal;
     default_ordinals_[extension_id].app_launch_ordinal = app_launch_ordinal;
     app_launch_ordinal = app_launch_ordinal.CreateAfter();
   }
 }
 
 bool ExtensionSorting::GetDefaultOrdinals(
     const std::string& extension_id,
     syncer::StringOrdinal* page_ordinal,
-    syncer::StringOrdinal* app_launch_ordinal) const {
+    syncer::StringOrdinal* app_launch_ordinal) {
+  CreateDefaultOrdinals();
   AppOrdinalsMap::const_iterator it = default_ordinals_.find(extension_id);
   if (it == default_ordinals_.end())
     return false;
 
   if (page_ordinal)
     *page_ordinal = it->second.page_ordinal;
   if (app_launch_ordinal)
     *app_launch_ordinal = it->second.app_launch_ordinal;
   return true;
 }
@@ skipping 31 matching lines @@
     const AppLaunchOrdinalMap& m) const {
   size_t result = 0;
   for (AppLaunchOrdinalMap::const_iterator it = m.begin(); it != m.end();
        ++it) {
     const std::string& id = it->second;
     if (ntp_hidden_extensions_.count(id) == 0)
       result++;
   }
   return result;
 }