Merge remote-tracking branch 'aosp/upstream-master' into merge

Conflicts:
	.idea/modules.xml
	platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesXmlLoader.java

Change-Id: Id899dae9a1e1c79272f8a70e14a7dcef4f760d7f

1 files changed, 14 insertions, 0 deletions

diff --git a/platform/core-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java b/platform/core-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java
index 62fbfa502c79..13d580ef0834 100644
--- a/platform/core-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java
+++ b/platform/core-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java
@@ -75,6 +75,7 @@ public class ApplicationInfoImpl extends ApplicationInfoEx implements JDOMExtern
   private boolean myShowLicensee = true;
   private String myWelcomeScreenCaptionUrl;
   private String myWelcomeScreenDeveloperSloganUrl;
+  private String myCustomizeIDEWizardStepsProvider;
   private UpdateUrls myUpdateUrls;
   private String myDocumentationUrl;
   private String mySupportUrl;
@@ -171,6 +172,8 @@ public class ApplicationInfoImpl extends ApplicationInfoEx implements JDOMExtern
 
   @NonNls private static final String ELEMENT_THIRD_PARTY = "third-party";
 
+  @NonNls private static final String CUSTOMIZE_IDE_WIZARD_STEPS = "customize-ide-wizard";
+  @NonNls private static final String STEPS_PROVIDER = "provider";
 
   public void initComponent() { }
 
@@ -311,6 +314,12 @@ public class ApplicationInfoImpl extends ApplicationInfoEx implements JDOMExtern
     return myWelcomeScreenLogoUrl;
   }
 
+  @Nullable
+  @Override
+  public String getCustomizeIDEWizardStepsProvider() {
+    return myCustomizeIDEWizardStepsProvider;
+  }
+
   @Override
   public String getEditorBackgroundImageUrl() {
     return myEditorBackgroundImageUrl;
@@ -598,6 +607,11 @@ public class ApplicationInfoImpl extends ApplicationInfoEx implements JDOMExtern
       myWelcomeScreenDeveloperSloganUrl = welcomeScreen.getAttributeValue(SLOGAN_URL_ATTR);
     }
 
+    Element wizardSteps = parentNode.getChild(CUSTOMIZE_IDE_WIZARD_STEPS);
+    if (wizardSteps != null) {
+      myCustomizeIDEWizardStepsProvider = wizardSteps.getAttributeValue(STEPS_PROVIDER);
+    }
+
     Element editor = parentNode.getChild(ELEMENT_EDITOR);
     if (editor != null) {
       myEditorBackgroundImageUrl = editor.getAttributeValue(BACKGROUND_URL_ATTR);