Revert 66646 - Add "open as window" menu item to NTP app menu....

chrome/browser/extensions/extension_toolbar_model.cc

 // Copyright (c) 2010 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_toolbar_model.h"
 
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profile.h"
@@ skipping 72 matching lines @@
 }
 
 void ExtensionToolbarModel::Observe(NotificationType type,
                                     const NotificationSource& source,
                                     const NotificationDetails& details) {
   if (type == NotificationType::EXTENSIONS_READY) {
     InitializeExtensionList();
     return;
   }
 
+  if (!service_->is_ready())
+    return;
+
   const Extension* extension = Details<const Extension>(details).ptr();
   if (type == NotificationType::EXTENSION_LOADED) {
     AddExtension(extension);
   } else if (type == NotificationType::EXTENSION_UNLOADED ||
              type == NotificationType::EXTENSION_UNLOADED_DISABLED) {
     RemoveExtension(extension);
   } else {
     NOTREACHED() << "Received unexpected notification";
   }
 }
@@ skipping 38 matching lines @@
 }
 
 // Combine the currently enabled extensions that have browser actions (which
 // we get from the ExtensionsService) with the ordering we get from the
 // pref service. For robustness we use a somewhat inefficient process:
 // 1. Create a vector of extensions sorted by their pref values. This vector may
 // have holes.
 // 2. Create a vector of extensions that did not have a pref value.
 // 3. Remove holes from the sorted vector and append the unsorted vector.
 void ExtensionToolbarModel::InitializeExtensionList() {
+  DCHECK(service_->is_ready());
+
   std::vector<std::string> pref_order = service_->extension_prefs()->
       GetToolbarOrder();
   // Items that have a pref for their position.
   ExtensionList sorted;
   sorted.resize(pref_order.size(), NULL);
   // The items that don't have a pref for their position.
   ExtensionList unsorted;
 
   // Create the lists.
   for (size_t i = 0; i < service_->extensions()->size(); ++i) {
@@ skipping 64 matching lines @@
   int incognito_index = 0, i = 0;
   for (ExtensionList::iterator iter = begin(); iter != end();
        ++iter, ++i) {
     if (original_index == i)
       break;
     if (service_->IsIncognitoEnabled(*iter))
       ++incognito_index;
   }
   return incognito_index;
 }