Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6208)

Unified Diff: chrome/browser/extensions/extension_service.cc

Issue 1291793005: Remove command line flag to install an ephemeral app. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Oops Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/extensions/startup_helper.h » ('j') | chrome/common/chrome_result_codes.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_service.cc
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index 3ed97062a3d71adc4ad5c3b407eeadce3cb98493..96e5fbff576f359e088cb9e4f2ed6823668c5b42 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -409,28 +409,19 @@ void ExtensionService::Init() {
DCHECK(!is_ready()); // Can't redo init.
DCHECK_EQ(registry_->enabled_extensions().size(), 0u);
- const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
- if (cmd_line->HasSwitch(switches::kInstallEphemeralAppFromWebstore)) {
- // The sole purpose of this launch is to install a new extension from CWS
- // and immediately terminate: loading already installed extensions is
- // unnecessary and may interfere with the inline install dialog (e.g. if an
- // extension listens to onStartup and opens a window).
- SetReadyAndNotifyListeners();
- } else {
- // LoadAllExtensions() calls OnLoadedInstalledExtensions().
- component_loader_->LoadAll();
- extensions::InstalledLoader(this).LoadAllExtensions();
+ // LoadAllExtensions() calls OnLoadedInstalledExtensions().
+ component_loader_->LoadAll();
+ extensions::InstalledLoader(this).LoadAllExtensions();
- EnabledReloadableExtensions();
- MaybeFinishShutdownDelayed();
- SetReadyAndNotifyListeners();
+ EnabledReloadableExtensions();
+ MaybeFinishShutdownDelayed();
+ SetReadyAndNotifyListeners();
- // TODO(erikkay): this should probably be deferred to a future point
- // rather than running immediately at startup.
- CheckForExternalUpdates();
+ // TODO(erikkay): this should probably be deferred to a future point
+ // rather than running immediately at startup.
+ CheckForExternalUpdates();
- LoadGreylistFromPrefs();
- }
+ LoadGreylistFromPrefs();
}
void ExtensionService::EnabledReloadableExtensions() {
« no previous file with comments | « no previous file | chrome/browser/extensions/startup_helper.h » ('j') | chrome/common/chrome_result_codes.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698