SearchBoxView now enables/disables cursor based on user interaction.

ui/app_list/views/search_box_view_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/app_list/views/search_box_view.h"
 
 #include <cctype>
 #include <map>
 
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
+#include "base/test/scoped_feature_list.h"
+#include "base/time/time.h"
+#include "ui/app_list/app_list_features.h"
 #include "ui/app_list/test/app_list_test_view_delegate.h"
 #include "ui/app_list/views/search_box_view_delegate.h"
+#include "ui/events/event.h"
+#include "ui/gfx/canvas.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/test/widget_test.h"
 
 namespace app_list {
 namespace test {
 
+constexpr SkColor kDefaultSearchboxColor =
+    SkColorSetARGBMacro(0xDE, 0x00, 0x00, 0x00);
+
+// Color of placeholder text in zero query state.
+constexpr SkColor kZeroQuerySearchboxColor =
+    SkColorSetARGBMacro(0x8A, 0x00, 0x00, 0x00);
+
 class KeyPressCounterView : public views::View {
  public:
   KeyPressCounterView() : count_(0) {}
   ~KeyPressCounterView() override {}
 
   int GetCountAndReset() {
     int count = count_;
     count_ = 0;
     return count;
   }
@@ skipping 15 matching lines @@
 class SearchBoxViewTest : public views::test::WidgetTest,
                           public SearchBoxViewDelegate {
  public:
   SearchBoxViewTest() : query_changed_count_(0) {}
   ~SearchBoxViewTest() override {}
 
   // Overridden from testing::Test:
   void SetUp() override {
     views::test::WidgetTest::SetUp();
     widget_ = CreateTopLevelPlatformWidget();
+  }
+
+  void InitializeViewWithFeatureFlags(bool enable_fullscreen_app_list) {
+    if (enable_fullscreen_app_list)
+      EnableFullscreenAppList();
+
     view_ = new SearchBoxView(this, &view_delegate_);
     counter_view_ = new KeyPressCounterView();
     widget_->GetContentsView()->AddChildView(view_);
     widget_->GetContentsView()->AddChildView(counter_view_);
     view_->set_contents_view(counter_view_);
   }
 
   void TearDown() override {
     widget_->CloseNow();
     views::test::WidgetTest::TearDown();
   }
 
+  void EnableFullscreenAppList() {
+    scoped_feature_list_.InitAndEnableFeature(
+        app_list::features::kEnableFullscreenAppList);
+  }
+
  protected:
   SearchBoxView* view() { return view_; }
 
   void SetLongAutoLaunchTimeout() {
     // Sets a long timeout that lasts longer than the test run.
     view_delegate_.set_auto_launch_timeout(base::TimeDelta::FromDays(1));
   }
 
   base::TimeDelta GetAutoLaunchTimeout() {
     return view_delegate_.GetAutoLaunchTimeout();
@@ skipping 38 matching lines @@
 
   void BackButtonPressed() override {}
 
   void SetSearchResultSelection(bool select) override {}
 
   AppListTestViewDelegate view_delegate_;
   views::Widget* widget_;
   SearchBoxView* view_;
   KeyPressCounterView* counter_view_;
   base::string16 last_query_;
+  base::test::ScopedFeatureList scoped_feature_list_;
   int query_changed_count_;
 
   DISALLOW_COPY_AND_ASSIGN(SearchBoxViewTest);
 };
 
 TEST_F(SearchBoxViewTest, Basic) {
+  InitializeViewWithFeatureFlags(false);
   KeyPress(ui::VKEY_A);
   EXPECT_EQ("a", GetLastQueryAndReset());
   EXPECT_EQ(1, GetQueryChangedCountAndReset());
   EXPECT_EQ(0, GetContentsViewKeyPressCountAndReset());
 
   KeyPress(ui::VKEY_DOWN);
   EXPECT_EQ(0, GetQueryChangedCountAndReset());
   EXPECT_EQ(1, GetContentsViewKeyPressCountAndReset());
 
   view()->ClearSearch();
   EXPECT_EQ(1, GetQueryChangedCountAndReset());
   EXPECT_TRUE(GetLastQueryAndReset().empty());
 }
 
 TEST_F(SearchBoxViewTest, CancelAutoLaunch) {
+  InitializeViewWithFeatureFlags(false);
   SetLongAutoLaunchTimeout();
   ASSERT_NE(base::TimeDelta(), GetAutoLaunchTimeout());
 
   // Normal key event cancels the timeout.
   KeyPress(ui::VKEY_A);
   EXPECT_EQ(base::TimeDelta(), GetAutoLaunchTimeout());
   ResetAutoLaunchTimeout();
 
   // Unusual key event doesn't cancel -- it will be canceled in
   // SearchResultListView.
   SetLongAutoLaunchTimeout();
   KeyPress(ui::VKEY_DOWN);
   EXPECT_NE(base::TimeDelta(), GetAutoLaunchTimeout());
   ResetAutoLaunchTimeout();
 
   // Clearing search box also cancels.
   SetLongAutoLaunchTimeout();
   view()->ClearSearch();
   EXPECT_EQ(base::TimeDelta(), GetAutoLaunchTimeout());
 }
 
+// Tests that a keypress enables the cursor and that an empty searchbox disables
+// the cursor.
+TEST_F(SearchBoxViewTest, KeyPressEnablesCursor) {
+  InitializeViewWithFeatureFlags(true);
+
+  views::Textfield* search_box_text_field = view()->search_box();
+  EXPECT_EQ(search_box_text_field->placeholder_text_draw_flags(),
+            gfx::Canvas::TEXT_ALIGN_CENTER);
+  EXPECT_EQ(search_box_text_field->placeholder_text_color(),
+            kDefaultSearchboxColor);
+  EXPECT_FALSE(view()->is_cursor_enabled());
+
+  // Press any key, the search box cursor should enable and the placeholder text
+  // should be aligned left
+  KeyPress(ui::VKEY_0);
+  EXPECT_EQ(search_box_text_field->placeholder_text_draw_flags(),
+            gfx::Canvas::TEXT_ALIGN_LEFT);
+  EXPECT_EQ(search_box_text_field->placeholder_text_color(),
+            kZeroQuerySearchboxColor);
+  EXPECT_TRUE(view()->is_cursor_enabled());
+
+  // Delete the text, the cursor should return to its previous state with the
+  // placeholder text back in place.
+  view()->ClearSearch();
+  EXPECT_EQ(search_box_text_field->placeholder_text_draw_flags(),
+            gfx::Canvas::TEXT_ALIGN_CENTER);
+  EXPECT_EQ(search_box_text_field->placeholder_text_color(),
+            kDefaultSearchboxColor);
+  EXPECT_FALSE(view()->is_cursor_enabled());
+}
+
+// Tests that the placeholder text and cursor are changed properly upon click.
+TEST_F(SearchBoxViewTest, PlaceHolderTextTest) {
+  InitializeViewWithFeatureFlags(true);
+
+  // Test that with no input the cursor is hidden and the text is center
+  // aligned.
+  views::Textfield* search_box_text_field = view()->search_box();
+  EXPECT_EQ(search_box_text_field->placeholder_text_draw_flags(),
+            gfx::Canvas::TEXT_ALIGN_CENTER);
+  EXPECT_EQ(search_box_text_field->placeholder_text_color(),
+            kDefaultSearchboxColor);
+  EXPECT_FALSE(view()->is_cursor_enabled());
+
+  // click search box, text changes and aligns left but is still there
+  gfx::Point search_box_point =
+      search_box_text_field->GetBoundsInScreen().CenterPoint();
+  ui::MouseEvent mouse_event =
+      ui::MouseEvent(ui::ET_MOUSE_PRESSED, search_box_point, search_box_point,
+                     base::TimeTicks::Now(), 0, 0);
+  EXPECT_TRUE(view()->OnMouseEvent(*mouse_event));
+  EXPECT_EQ(search_box_text_field->placeholder_text_draw_flags(),
+            gfx::Canvas::TEXT_ALIGN_LEFT);
+  EXPECT_EQ(search_box_text_field->placeholder_text_color(),
+            kZeroQuerySearchboxColor);
+  EXPECT_TRUE(view()->is_cursor_enabled());
+}
+
 }  // namespace test
 }  // namespace app_list