[Files.app] Remove the flag of flipping the webstore integration

The webstore integration with Files.app has been launched successfully, so we don't need the flag to flop anymore. BUG=341320 TEST=none Review URL: https://codereview.chromium.org/151913008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@249646 0039d316-1c4b-4281-b951-d872f2087c98
qweri0p · Feb 7, 2014 · 35d0092 · 35d0092
1 parent 7b2bfda
commit 35d0092
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 31 deletions.
diff --git a/chrome/app/chromeos_strings.grdp b/chrome/app/chromeos_strings.grdp
@@ -118,12 +118,6 @@ Press any key to continue exploring.
   <message name="IDS_FLAGS_FILE_MANAGER_ENABLE_NEW_AUDIO_PLAYER_DESCRIPTION" desc="Description of the about:flag option to the enable new audio player app.">
     Use the experimental new audio player instead of the stable one.
   </message>
-  <message name="IDS_FLAGS_FILE_MANAGER_ENABLE_WEBSTORE_INTEGRATION" desc="Name of the about:flag option to enable the webstore integration feature in Files app.">
-    Enable the integration of Webstore and Files.app.
-  </message>
-  <message name="IDS_FLAGS_FILE_MANAGER_ENABLE_WEBSTORE_INTEGRATION_DESCRIPTION" desc="Description of the about:flag option to enable the webstore integration feature in Files app.">
-    Enables the webstore integration feature in Files.app.
-  </message>
   <message name="IDS_FILE_BROWSER_ARCHIVE_DIRECTORY_LABEL" desc="/archive directory label.">
     Archives
   </message>

diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
@@ -1165,13 +1165,6 @@ const Experiment kExperiments[] = {
     kOsCrOS,
     SINGLE_VALUE_TYPE(chromeos::switches::kFileManagerEnableNewAudioPlayer)
   },
-  {
-    "file-manager-enable-webstore-integration",
-    IDS_FLAGS_FILE_MANAGER_ENABLE_WEBSTORE_INTEGRATION,
-    IDS_FLAGS_FILE_MANAGER_ENABLE_WEBSTORE_INTEGRATION_DESCRIPTION,
-    kOsCrOS,
-    SINGLE_VALUE_TYPE(chromeos::switches::kFileManagerEnableWebstoreIntegration)
-  },
   {
     "disable-quickoffice-component-app",
     IDS_FLAGS_DISABLE_QUICKOFFICE_COMPONENT_APP_NAME,

diff --git a/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc b/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc
@@ -524,11 +524,6 @@ void FileManagerBrowserTest::SetUpCommandLine(CommandLine* command_line) {
     command_line->AppendSwitchNative(chromeos::switches::kLoginUser, "");
     command_line->AppendSwitch(switches::kIncognito);
   }
-  // TODO(yoshiki): Remove the flag when the feature is launched.
-  if (std::tr1::get<1>(GetParam()) == std::string("suggestAppDialog")) {
-    command_line->AppendSwitch(
-        chromeos::switches::kFileManagerEnableWebstoreIntegration);
-  }
   ExtensionApiTest::SetUpCommandLine(command_line);
 }
 

diff --git a/chrome/browser/resources/file_manager/foreground/js/file_manager.js b/chrome/browser/resources/file_manager/foreground/js/file_manager.js
@@ -216,9 +216,6 @@ var BOTTOM_MARGIN_FOR_PREVIEW_PANEL_PX = 52;
       }.bind(this));
     }.bind(this));
 
-    // TODO(yoshiki): Remove the flag when the feature is launched.
-    this.enableExperimentalWebstoreIntegration_ = true;
-
     group.run(callback);
   };
 

diff --git a/chrome/browser/resources/file_manager/foreground/js/file_tasks.js b/chrome/browser/resources/file_manager/foreground/js/file_tasks.js
@@ -360,11 +360,6 @@ FileTasks.prototype.executeDefaultInternal_ = function(entries, opt_callback) {
 
   var onViewFilesFailure = function() {
     var fm = this.fileManager_;
-    if (fm.enableExperimentalWebStoreIntegration_) {
-      showAlert();
-      return;
-    }
-
     if (!fm.isOnDrive() ||
         !entries[0] ||
         FileTasks.EXTENSIONS_TO_SKIP_SUGGEST_APPS_.indexOf(extension) !== -1) {

diff --git a/chromeos/chromeos_switches.cc b/chromeos/chromeos_switches.cc
@@ -128,10 +128,6 @@ const char kFileManagerShowCheckboxes[]     = "file-manager-show-checkboxes";
 const char kFileManagerEnableNewAudioPlayer[] =
     "file-manager-enable-new-audio-player";
 
-// Enables the webstore integration feature in the Files.app.
-const char kFileManagerEnableWebstoreIntegration[] =
-    "file-manager-enable-webstore-integration";
-
 // Enables the multi-profile support in the Files.app.
 const char kFileManagerEnableMultiProfile[] =
     "file-manager-enable-multi-profile";

diff --git a/chromeos/chromeos_switches.h b/chromeos/chromeos_switches.h
@@ -52,7 +52,6 @@ CHROMEOS_EXPORT extern const char kEnterpriseEnrollmentModulusLimit[];
 CHROMEOS_EXPORT extern const char kEnterpriseEnrollmentSkipRobotAuth[];
 CHROMEOS_EXPORT extern const char kFileManagerShowCheckboxes[];
 CHROMEOS_EXPORT extern const char kFileManagerEnableNewAudioPlayer[];
-CHROMEOS_EXPORT extern const char kFileManagerEnableWebstoreIntegration[];
 CHROMEOS_EXPORT extern const char kFileManagerEnableMultiProfile[];
 CHROMEOS_EXPORT extern const char kFirstExecAfterBoot[];
 CHROMEOS_EXPORT extern const char kForceLoginManagerInTests[];