Revert 66646 - Add "open as window" menu item to NTP app menu.
BUG=59697
TEST=BrowserTest.OpenAppWindowLikeNtp,SessionRestoreUITest.RestoreAfterClosing*
Review URL: http://codereview.chromium.org/5019005
[email protected]
Review URL: http://codereview.chromium.org/5168004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66665 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/extensions/extensions_service.cc b/chrome/browser/extensions/extensions_service.cc
index 13fee460..e8f39aa 100644
--- a/chrome/browser/extensions/extensions_service.cc
+++ b/chrome/browser/extensions/extensions_service.cc
@@ -538,7 +538,7 @@
install_directory_(install_directory),
extensions_enabled_(true),
show_extensions_prompts_(true),
- init_done_(false),
+ ready_(false),
ALLOW_THIS_IN_INITIALIZER_LIST(toolbar_model_(this)),
default_apps_(profile->GetPrefs()),
event_routers_initialized_(false) {
@@ -608,7 +608,7 @@
void ExtensionsService::Init() {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- DCHECK(!init_done_); // Can't redo init.
+ DCHECK(!ready_);
DCHECK_EQ(extensions_.size(), 0u);
// Hack: we need to ensure the ResourceDispatcherHost is ready before we load
@@ -623,8 +623,6 @@
// TODO(erikkay) this should probably be deferred as well.
GarbageCollectExtensions();
-
- init_done_ = true;
}
void ExtensionsService::InstallExtension(const FilePath& extension_path) {
@@ -1475,6 +1473,7 @@
}
void ExtensionsService::OnLoadedInstalledExtensions() {
+ ready_ = true;
if (updater_.get()) {
updater_->Start();
}
