Removed kAshDisableTextFilteringInOverviewMode flag.

Now that the text filtering feature is mature, we can remove the flag
that allows disabling it safely.

BUG=452107
TEST=manual

Review URL: https://codereview.chromium.org/878173002

Cr-Commit-Position: refs/heads/master@{#313776}

5 files changed, 3 insertions, 26 deletions

diff --git a/ash/ash_switches.cc b/ash/ash_switches.cc
index 637d7d0..270a39f 100644
--- a/ash/ash_switches.cc
+++ b/ash/ash_switches.cc
@@ -29,10 +29,6 @@ const char kAshCopyHostBackgroundAtBoot[] = "ash-copy-host-background-at-boot";
 // Enable keyboard shortcuts useful for debugging.
 const char kAshDebugShortcuts[] = "ash-debug-shortcuts";
 
-// Enables text filtering with the keyboard in Overview Mode.
-const char kAshDisableTextFilteringInOverviewMode[] =
-    "ash-disable-text-filtering-in-overview-mode";
-
 // Disables LockLayoutManager used for LockScreenContainer, return back to
 // WorkspaceLayoutManager.
 const char kAshDisableLockLayoutManager[] = "ash-disable-lock-layout-manager";
diff --git a/ash/ash_switches.h b/ash/ash_switches.h
index 9562beb..12a71dc 100644
--- a/ash/ash_switches.h
+++ b/ash/ash_switches.h
@@ -22,7 +22,6 @@ ASH_EXPORT extern const char kAshConstrainPointerToRoot[];
 ASH_EXPORT extern const char kAshCopyHostBackgroundAtBoot[];
 ASH_EXPORT extern const char kAshDebugShortcuts[];
 ASH_EXPORT extern const char kAshDisableLockLayoutManager[];
-ASH_EXPORT extern const char kAshDisableTextFilteringInOverviewMode[];
 ASH_EXPORT extern const char kAshDisableTouchExplorationMode[];
 #if defined(OS_CHROMEOS)
 ASH_EXPORT extern const char kAshEnableFullscreenAppList[];
diff --git a/ash/wm/overview/window_grid.cc b/ash/wm/overview/window_grid.cc
index b605ad5..a03966a 100644
--- a/ash/wm/overview/window_grid.cc
+++ b/ash/wm/overview/window_grid.cc
@@ -162,16 +162,9 @@ void WindowGrid::PositionWindows(bool animate) {
       ScreenUtil::GetDisplayWorkAreaBoundsInParent(
           Shell::GetContainer(root_window_, kShellWindowId_DefaultContainer)));
 
-  // If the text filtering feature is enabled, reserve space at the top for the
-  // text filtering textbox to appear.
-  if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kAshDisableTextFilteringInOverviewMode)) {
-    total_bounds.Inset(
-        0,
-        WindowSelector::kTextFilterBottomEdge + kTextFilterBottomMargin,
-        0,
-        0);
-  }
+  // Reserve space at the top for the text filtering textbox to appear.
+  total_bounds.Inset(
+      0, WindowSelector::kTextFilterBottomEdge + kTextFilterBottomMargin, 0, 0);
 
   // Find the minimum number of windows per row that will fit all of the
   // windows on screen.
diff --git a/ash/wm/overview/window_selector.cc b/ash/wm/overview/window_selector.cc
index 0a63e8f..de86abe 100644
--- a/ash/wm/overview/window_selector.cc
+++ b/ash/wm/overview/window_selector.cc
@@ -511,11 +511,6 @@ void WindowSelector::OnAttemptToReactivateWindow(aura::Window* request_active,
 
 void WindowSelector::ContentsChanged(views::Textfield* sender,
                                      const base::string16& new_contents) {
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kAshDisableTextFilteringInOverviewMode)) {
-    return;
-  }
-
   text_filter_string_length_ = new_contents.length();
   if (!text_filter_string_length_)
     num_times_textfield_cleared_++;
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 991de74..fdd603f 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -973,12 +973,6 @@ const Experiment kExperiments[] = {
     kOsCrOS,
     SINGLE_VALUE_TYPE(switches::kDisableTouchFeedback),
   },
-  { "ash-disable-text-filtering-in-overview-mode",
-    IDS_FLAGS_ASH_DISABLE_TEXT_FILTERING_IN_OVERVIEW_MODE_NAME,
-    IDS_FLAGS_ASH_DISABLE_TEXT_FILTERING_IN_OVERVIEW_MODE_DESCRIPTION,
-    kOsCrOS,
-    SINGLE_VALUE_TYPE(ash::switches::kAshDisableTextFilteringInOverviewMode),
-  },
   { "ash-enable-mirrored-screen",
     IDS_FLAGS_ASH_ENABLE_MIRRORED_SCREEN_NAME,
     IDS_FLAGS_ASH_ENABLE_MIRRORED_SCREEN_DESCRIPTION,