Move //ui/chromeos/search_box to //ash/search_box, part 2

- Change namespace from search_box to ash.
- Rename some constants to add prefix kSearchBox
- Eliminate SEARCH_BOX_EXPORT macros. They aren't needed because
  search box is just a source_set.

Bug: 1131641
Test: compiles, ash_unittests
Change-Id: I55a4706bc57de90a823663a6f42f4554c09577b7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2430043
Commit-Queue: James Cook <jamescook@chromium.org>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#810461}

ash/app_list/views/app_list_main_view.cc

@@ -181,7 +181,7 @@ void AppListMainView::OnAppListStateChanged(AppListState new_state,
   }
 }
 
-void AppListMainView::QueryChanged(search_box::SearchBoxViewBase* sender) {
+void AppListMainView::QueryChanged(SearchBoxViewBase* sender) {
   base::string16 raw_query = search_model_->search_box()->text();
   base::string16 query;
   base::TrimWhitespace(raw_query, base::TRIM_ALL, &query);
@@ -194,7 +194,7 @@ void AppListMainView::QueryChanged(search_box::SearchBoxViewBase* sender) {
   delegate_->StartSearch(raw_query);
 }
 
-void AppListMainView::ActiveChanged(search_box::SearchBoxViewBase* sender) {
+void AppListMainView::ActiveChanged(SearchBoxViewBase* sender) {
   if (!app_list_features::IsZeroStateSuggestionsEnabled())
     return;
   // Do not update views on closing.
@@ -215,8 +215,7 @@ void AppListMainView::ActiveChanged(search_box::SearchBoxViewBase* sender) {
   }
 }
 
-void AppListMainView::SearchBoxFocusChanged(
-    search_box::SearchBoxViewBase* sender) {
+void AppListMainView::SearchBoxFocusChanged(SearchBoxViewBase* sender) {
   // A fake focus (highlight) is always set on the first search result. When the
   // user moves focus from the search box textfield (e.g. to close button or
   // last search result), the fake focus should be removed.

ash/app_list/views/app_list_main_view.h

@@ -16,10 +16,6 @@
 #include "base/timer/timer.h"
 #include "ui/views/view.h"
 
-namespace search_box {
-class SearchBoxViewBase;
-}  // namespace search_box
-
 namespace ash {
 
 class AppListItem;
@@ -30,13 +26,13 @@ class ApplicationDragAndDropHost;
 class ContentsView;
 class PaginationModel;
 class SearchBoxView;
+class SearchBoxViewBase;
 
 // AppListMainView contains the normal view of the app list, which is shown
 // when the user is signed in.
-class APP_LIST_EXPORT AppListMainView
-    : public views::View,
-      public AppListModelObserver,
-      public search_box::SearchBoxViewDelegate {
+class APP_LIST_EXPORT AppListMainView : public views::View,
+                                        public AppListModelObserver,
+                                        public SearchBoxViewDelegate {
  public:
   AppListMainView(AppListViewDelegate* delegate, AppListView* app_list_view);
   ~AppListMainView() override;
@@ -90,11 +86,11 @@ class APP_LIST_EXPORT AppListMainView
   PaginationModel* GetAppsPaginationModel();
 
   // Overridden from SearchBoxViewDelegate:
-  void QueryChanged(search_box::SearchBoxViewBase* sender) override;
+  void QueryChanged(SearchBoxViewBase* sender) override;
   void AssistantButtonPressed() override;
   void BackButtonPressed() override;
-  void ActiveChanged(search_box::SearchBoxViewBase* sender) override;
-  void SearchBoxFocusChanged(search_box::SearchBoxViewBase* sender) override;
+  void ActiveChanged(SearchBoxViewBase* sender) override;
+  void SearchBoxFocusChanged(SearchBoxViewBase* sender) override;
 
   AppListViewDelegate* delegate_;  // Owned by parent view (AppListView).
   AppListModel* model_;        // Unowned; ownership is handled by |delegate_|.

ash/app_list/views/app_list_view_unittest.cc

@@ -2077,7 +2077,7 @@ TEST_F(AppListViewTest, SearchBoxCornerRadiusDuringDragging) {
   view_->OnGestureEvent(&update_event);
 
   EXPECT_TRUE(IsStateShown(ash::AppListState::kStateApps));
-  EXPECT_EQ(search_box::kSearchBoxBorderCornerRadius,
+  EXPECT_EQ(kSearchBoxBorderCornerRadius,
             search_box_view()->GetSearchBoxBorderCornerRadiusForState(
                 ash::AppListState::kStateApps));
 
@@ -2085,7 +2085,7 @@ TEST_F(AppListViewTest, SearchBoxCornerRadiusDuringDragging) {
   // during drag.
   EXPECT_TRUE(SetAppListState(ash::AppListState::kStateSearchResults));
   EXPECT_TRUE(view_->is_in_drag());
-  EXPECT_EQ(search_box::kSearchBoxBorderCornerRadius,
+  EXPECT_EQ(kSearchBoxBorderCornerRadius,
             search_box_view()->GetSearchBoxBorderCornerRadiusForState(
                 ash::AppListState::kStateSearchResults));
   histogram_tester.ExpectTotalCount(
@@ -2105,7 +2105,7 @@ TEST_F(AppListViewTest, SearchBoxCornerRadiusDuringDragging) {
   // Search box should keep |kSearchBoxCornerRadiusFullscreen| corner radius
   // if launcher drag finished.
   EXPECT_FALSE(view_->is_in_drag());
-  EXPECT_EQ(search_box::kSearchBoxBorderCornerRadius,
+  EXPECT_EQ(kSearchBoxBorderCornerRadius,
             search_box_view()->GetSearchBoxBorderCornerRadiusForState(
                 ash::AppListState::kStateApps));
   histogram_tester.ExpectTotalCount(

ash/app_list/views/assistant/assistant_main_view.cc

@@ -107,7 +107,7 @@ void AssistantMainView::OnUiVisibilityChanged(
 }
 
 void AssistantMainView::InitLayout() {
-  constexpr int radius = search_box::kSearchBoxBorderCornerRadiusSearchResult;
+  constexpr int radius = kSearchBoxBorderCornerRadiusSearchResult;
 
   SetPaintToLayer();
   layer()->SetFillsBoundsOpaquely(false);

ash/app_list/views/assistant/assistant_page_view.cc

@@ -427,7 +427,7 @@ void AssistantPageView::InitLayout() {
 
   view_shadow_ = std::make_unique<ViewShadow>(this, kShadowElevation);
   view_shadow_->SetRoundedCornerRadius(
-      search_box::kSearchBoxBorderCornerRadiusSearchResult);
+      kSearchBoxBorderCornerRadiusSearchResult);
 
   SetBackground(views::CreateSolidBackground(SK_ColorWHITE));
   SetLayoutManager(std::make_unique<AssistantPageViewLayout>(this));

ash/app_list/views/search_box_view.cc

@@ -85,10 +85,10 @@ bool IsTrimmedQueryEmpty(const base::string16& query) {
 
 }  // namespace
 
-SearchBoxView::SearchBoxView(search_box::SearchBoxViewDelegate* delegate,
+SearchBoxView::SearchBoxView(SearchBoxViewDelegate* delegate,
                              AppListViewDelegate* view_delegate,
                              AppListView* app_list_view)
-    : search_box::SearchBoxViewBase(delegate),
+    : SearchBoxViewBase(delegate),
       view_delegate_(view_delegate),
       app_list_view_(app_list_view),
       is_app_list_search_autocomplete_enabled_(
@@ -128,7 +128,7 @@ void SearchBoxView::ResetForShow() {
 }
 
 void SearchBoxView::ClearSearch() {
-  search_box::SearchBoxViewBase::ClearSearch();
+  SearchBoxViewBase::ClearSearch();
   current_query_.clear();
   app_list_view_->SetStateFromSearchBoxView(
       true, false /*triggered_by_contents_change*/);
@@ -147,7 +147,7 @@ void SearchBoxView::HandleSearchBoxEvent(ui::LocatedEvent* located_event) {
       return;
     }
   }
-  search_box::SearchBoxViewBase::HandleSearchBoxEvent(located_event);
+  SearchBoxViewBase::HandleSearchBoxEvent(located_event);
 }
 
 void SearchBoxView::ModelChanged() {
@@ -197,7 +197,7 @@ void SearchBoxView::UpdateSearchIcon() {
                                     ? google_icon
                                     : kSearchEngineNotGoogleIcon;
   SetSearchIconImage(gfx::CreateVectorIcon(
-      icon, search_box::kIconSize,
+      icon, kSearchBoxIconSize,
       AppListColorProvider::Get()->GetSearchBoxIconColor()));
 }
 
@@ -234,7 +234,7 @@ void SearchBoxView::SetupCloseButton() {
   views::ImageButton* close = close_button();
   close->SetImage(views::ImageButton::STATE_NORMAL,
                   gfx::CreateVectorIcon(
-                      views::kIcCloseIcon, search_box::kIconSize,
+                      views::kIcCloseIcon, kSearchBoxIconSize,
                       AppListColorProvider::Get()->GetSearchBoxIconColor()));
   close->SetVisible(false);
   base::string16 close_button_label(
@@ -259,16 +259,16 @@ void SearchBoxView::SetupBackButton() {
 
 void SearchBoxView::RecordSearchBoxActivationHistogram(
     ui::EventType event_type) {
-  search_box::ActivationSource activation_type;
+  ActivationSource activation_type;
   switch (event_type) {
     case ui::ET_GESTURE_TAP:
-      activation_type = search_box::ActivationSource::kGestureTap;
+      activation_type = ActivationSource::kGestureTap;
       break;
     case ui::ET_MOUSE_PRESSED:
-      activation_type = search_box::ActivationSource::kMousePress;
+      activation_type = ActivationSource::kMousePress;
       break;
     case ui::ET_KEY_PRESSED:
-      activation_type = search_box::ActivationSource::kKeyPress;
+      activation_type = ActivationSource::kKeyPress;
       break;
     default:
       return;
@@ -348,11 +348,10 @@ void SearchBoxView::UpdateLayout(double progress,
   // Horizontal margins are selected to match search box icon's vertical
   // margins.
   const int horizontal_spacing = gfx::Tween::LinearIntValueBetween(
-      progress, (current_state_height - search_box::kIconSize) / 2,
-      (target_state_height - search_box::kIconSize) / 2);
+      progress, (current_state_height - kSearchBoxIconSize) / 2,
+      (target_state_height - kSearchBoxIconSize) / 2);
   const int horizontal_right_padding =
-      horizontal_spacing -
-      (search_box::kButtonSizeDip - search_box::kIconSize) / 2;
+      horizontal_spacing - (kSearchBoxButtonSizeDip - kSearchBoxIconSize) / 2;
   box_layout()->set_inside_border_insets(
       gfx::Insets(0, horizontal_spacing, 0, horizontal_right_padding));
   box_layout()->set_between_child_spacing(horizontal_spacing);
@@ -368,9 +367,9 @@ int SearchBoxView::GetSearchBoxBorderCornerRadiusForState(
     AppListState state) const {
   if (state == AppListState::kStateSearchResults &&
       !app_list_view_->is_in_drag()) {
-    return search_box::kSearchBoxBorderCornerRadiusSearchResult;
+    return kSearchBoxBorderCornerRadiusSearchResult;
   }
-  return search_box::kSearchBoxBorderCornerRadius;
+  return kSearchBoxBorderCornerRadius;
 }
 
 SkColor SearchBoxView::GetBackgroundColorForState(AppListState state) const {
@@ -505,7 +504,7 @@ void SearchBoxView::ContentsChanged(views::Textfield* sender,
   // Update autocomplete text highlight range to track user typed text.
   if (ShouldProcessAutocomplete())
     ResetHighlightRange();
-  search_box::SearchBoxViewBase::ContentsChanged(sender, new_contents);
+  SearchBoxViewBase::ContentsChanged(sender, new_contents);
   app_list_view_->SetStateFromSearchBoxView(
       IsSearchBoxTrimmedQueryEmpty(), true /*triggered_by_contents_change*/);
 }
@@ -717,15 +716,14 @@ bool SearchBoxView::HandleMouseEvent(views::Textfield* sender,
     return false;
   }
 
-  return search_box::SearchBoxViewBase::HandleMouseEvent(sender, mouse_event);
+  return SearchBoxViewBase::HandleMouseEvent(sender, mouse_event);
 }
 
 bool SearchBoxView::HandleGestureEvent(views::Textfield* sender,
                                        const ui::GestureEvent& gesture_event) {
   if (gesture_event.type() == ui::ET_GESTURE_TAP && HasAutocompleteText())
     AcceptAutocompleteText();
-  return search_box::SearchBoxViewBase::HandleGestureEvent(sender,
-                                                           gesture_event);
+  return SearchBoxViewBase::HandleGestureEvent(sender, gesture_event);
 }
 
 void SearchBoxView::ButtonPressed(views::Button* sender,
@@ -734,7 +732,7 @@ void SearchBoxView::ButtonPressed(views::Button* sender,
     view_delegate_->LogSearchAbandonHistogram();
     SetSearchBoxActive(false, ui::ET_UNKNOWN);
   }
-  search_box::SearchBoxViewBase::ButtonPressed(sender, event);
+  SearchBoxViewBase::ButtonPressed(sender, event);
 }
 
 void SearchBoxView::UpdateSearchBoxTextForSelectedResult(
@@ -795,7 +793,7 @@ void SearchBoxView::SetupAssistantButton() {
   assistant->SetImage(
       views::ImageButton::STATE_NORMAL,
       gfx::CreateVectorIcon(
-          chromeos::kAssistantIcon, search_box::kIconSize,
+          chromeos::kAssistantIcon, kSearchBoxIconSize,
           AppListColorProvider::Get()->GetSearchBoxIconColor()));
   base::string16 assistant_button_label(
       l10n_util::GetStringUTF16(IDS_APP_LIST_START_ASSISTANT));

ash/app_list/views/search_box_view.h

@@ -25,14 +25,14 @@ class AppListViewDelegate;
 class ContentsView;
 class SearchModel;
 
-// Subclass of search_box::SearchBoxViewBase. SearchBoxModel is its data model
+// Subclass of SearchBoxViewBase. SearchBoxModel is its data model
 // that controls what icon to display, what placeholder text to use for
 // Textfield. The text and selection model part could be set to change the
 // contents and selection model of the Textfield.
-class APP_LIST_EXPORT SearchBoxView : public search_box::SearchBoxViewBase,
+class APP_LIST_EXPORT SearchBoxView : public SearchBoxViewBase,
                                       public SearchBoxModelObserver {
  public:
-  SearchBoxView(search_box::SearchBoxViewDelegate* delegate,
+  SearchBoxView(SearchBoxViewDelegate* delegate,
                 AppListViewDelegate* view_delegate,
                 AppListView* app_list_view = nullptr);
   ~SearchBoxView() override;
@@ -48,7 +48,7 @@ class APP_LIST_EXPORT SearchBoxView : public search_box::SearchBoxViewBase,
   // Returns the total focus ring spacing for use in folders.
   static int GetFocusRingSpacing();
 
-  // Overridden from search_box::SearchBoxViewBase:
+  // Overridden from SearchBoxViewBase:
   void ClearSearch() override;
   views::View* GetSelectedViewInContentsView() override;
   void HandleSearchBoxEvent(ui::LocatedEvent* located_event) override;

ash/app_list/views/search_box_view_unittest.cc

@@ -64,7 +64,7 @@ class KeyPressCounterView : public ContentsView {
 };
 
 class SearchBoxViewTest : public views::test::WidgetTest,
-                          public search_box::SearchBoxViewDelegate {
+                          public SearchBoxViewDelegate {
  public:
   SearchBoxViewTest() = default;
   ~SearchBoxViewTest() override = default;
@@ -168,15 +168,15 @@ class SearchBoxViewTest : public views::test::WidgetTest,
 
  private:
   // Overridden from SearchBoxViewDelegate:
-  void QueryChanged(search_box::SearchBoxViewBase* sender) override {
+  void QueryChanged(SearchBoxViewBase* sender) override {
     ++query_changed_count_;
     last_query_ = sender->search_box()->GetText();
   }
 
   void AssistantButtonPressed() override {}
   void BackButtonPressed() override {}
-  void ActiveChanged(search_box::SearchBoxViewBase* sender) override {}
-  void SearchBoxFocusChanged(search_box::SearchBoxViewBase* sender) override {}
+  void ActiveChanged(SearchBoxViewBase* sender) override {}
+  void SearchBoxFocusChanged(SearchBoxViewBase* sender) override {}
 
   AppListTestViewDelegate view_delegate_;
   views::Widget* widget_;
@@ -255,9 +255,8 @@ TEST_F(SearchBoxViewTest, SearchBoxInactiveByDefault) {
 TEST_F(SearchBoxViewTest, SearchBoxInactiveSearchBoxGoogle) {
   SetSearchEngineIsGoogle(true);
   SetSearchBoxActive(false, ui::ET_UNKNOWN);
-  const gfx::ImageSkia expected_icon =
-      gfx::CreateVectorIcon(kGoogleBlackIcon, search_box::kIconSize,
-                            search_box::kDefaultSearchboxColor);
+  const gfx::ImageSkia expected_icon = gfx::CreateVectorIcon(
+      kGoogleBlackIcon, kSearchBoxIconSize, kDefaultSearchboxColor);
   view()->ModelChanged();
 
   const gfx::ImageSkia actual_icon =
@@ -271,9 +270,8 @@ TEST_F(SearchBoxViewTest, SearchBoxInactiveSearchBoxGoogle) {
 TEST_F(SearchBoxViewTest, SearchBoxActiveSearchEngineGoogle) {
   SetSearchEngineIsGoogle(true);
   SetSearchBoxActive(true, ui::ET_MOUSE_PRESSED);
-  const gfx::ImageSkia expected_icon =
-      gfx::CreateVectorIcon(kGoogleColorIcon, search_box::kIconSize,
-                            search_box::kDefaultSearchboxColor);
+  const gfx::ImageSkia expected_icon = gfx::CreateVectorIcon(
+      kGoogleColorIcon, kSearchBoxIconSize, kDefaultSearchboxColor);
   view()->ModelChanged();
 
   const gfx::ImageSkia actual_icon =
@@ -287,9 +285,8 @@ TEST_F(SearchBoxViewTest, SearchBoxActiveSearchEngineGoogle) {
 TEST_F(SearchBoxViewTest, SearchBoxInactiveSearchEngineNotGoogle) {
   SetSearchEngineIsGoogle(false);
   SetSearchBoxActive(false, ui::ET_UNKNOWN);
-  const gfx::ImageSkia expected_icon =
-      gfx::CreateVectorIcon(kSearchEngineNotGoogleIcon, search_box::kIconSize,
-                            search_box::kDefaultSearchboxColor);
+  const gfx::ImageSkia expected_icon = gfx::CreateVectorIcon(
+      kSearchEngineNotGoogleIcon, kSearchBoxIconSize, kDefaultSearchboxColor);
   view()->ModelChanged();
 
   const gfx::ImageSkia actual_icon =
@@ -303,9 +300,8 @@ TEST_F(SearchBoxViewTest, SearchBoxInactiveSearchEngineNotGoogle) {
 TEST_F(SearchBoxViewTest, SearchBoxActiveSearchEngineNotGoogle) {
   SetSearchEngineIsGoogle(false);
   SetSearchBoxActive(true, ui::ET_UNKNOWN);
-  const gfx::ImageSkia expected_icon =
-      gfx::CreateVectorIcon(kSearchEngineNotGoogleIcon, search_box::kIconSize,
-                            search_box::kDefaultSearchboxColor);
+  const gfx::ImageSkia expected_icon = gfx::CreateVectorIcon(
+      kSearchEngineNotGoogleIcon, kSearchBoxIconSize, kDefaultSearchboxColor);
   view()->ModelChanged();
 
   const gfx::ImageSkia actual_icon =

ash/app_list/views/search_result_page_view.cc

@@ -179,7 +179,7 @@ SearchResultPageView::SearchResultPageView(SearchModel* search_model)
   view_shadow_ =
       std::make_unique<ViewShadow>(this, kSearchBoxSearchResultShadowElevation);
   view_shadow_->SetRoundedCornerRadius(
-      search_box::kSearchBoxBorderCornerRadiusSearchResult);
+      kSearchBoxBorderCornerRadiusSearchResult);
 
   // Hides this view behind the search box by using the same color and
   // background border corner radius. All child views' background should be

ash/search_box/BUILD.gn

@@ -5,14 +5,11 @@
 source_set("search_box") {
   sources = [
     "search_box_constants.h",
-    "search_box_export.h",
     "search_box_view_base.cc",
     "search_box_view_base.h",
     "search_box_view_delegate.h",
   ]
 
-  defines = [ "SEARCH_BOX_IMPLEMENTATION" ]
-
   deps = [
     "//base",
     "//skia",

ash/search_box/search_box_constants.h

@@ -5,38 +5,36 @@
 #ifndef ASH_SEARCH_BOX_SEARCH_BOX_CONSTANTS_H_
 #define ASH_SEARCH_BOX_SEARCH_BOX_CONSTANTS_H_
 
-#include "ash/search_box/search_box_export.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/color_palette.h"
 
-namespace search_box {
+namespace ash {
 
 // Default color used when wallpaper customized color is not available for
 // searchbox, #000 at 87% opacity.
-SEARCH_BOX_EXPORT constexpr SkColor kDefaultSearchboxColor =
-    gfx::kGoogleGrey200;
+constexpr SkColor kDefaultSearchboxColor = gfx::kGoogleGrey200;
 
 // The horizontal padding of the box layout of the search box.
-SEARCH_BOX_EXPORT constexpr int kPadding = 12;
+constexpr int kSearchBoxPadding = 12;
 
 // The default background color of the search box.
-SEARCH_BOX_EXPORT constexpr SkColor kSearchBoxBackgroundDefault = SK_ColorWHITE;
+constexpr SkColor kSearchBoxBackgroundDefault = SK_ColorWHITE;
 
 // The background border corner radius of the search box.
-SEARCH_BOX_EXPORT constexpr int kSearchBoxBorderCornerRadius = 24;
+constexpr int kSearchBoxBorderCornerRadius = 24;
 
 // The background border corner radius of the expanded search box.
-SEARCH_BOX_EXPORT constexpr int kSearchBoxBorderCornerRadiusSearchResult = 20;
+constexpr int kSearchBoxBorderCornerRadiusSearchResult = 20;
 
 // Preferred height of search box.
-SEARCH_BOX_EXPORT constexpr int kSearchBoxPreferredHeight = 48;
+constexpr int kSearchBoxPreferredHeight = 48;
 
 // The size of the icon in the search box.
-SEARCH_BOX_EXPORT constexpr int kIconSize = 24;
+constexpr int kSearchBoxIconSize = 24;
 
 // The size of the image button in the search box.
-SEARCH_BOX_EXPORT constexpr int kButtonSizeDip = 40;
+constexpr int kSearchBoxButtonSizeDip = 40;
 
-}  // namespace search_box
+}  // namespace ash
 
 #endif  // ASH_SEARCH_BOX_SEARCH_BOX_CONSTANTS_H_

ash/search_box/search_box_export.h

-// Copyright 2018 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.
-
-#ifndef ASH_SEARCH_BOX_SEARCH_BOX_EXPORT_H_
-#define ASH_SEARCH_BOX_SEARCH_BOX_EXPORT_H_
-
-// Defines SEARCH_BOX_EXPORT so that functionality implemented by the search_box
-// module can be exported to consumers.
-
-#if defined(COMPONENT_BUILD)
-#if defined(WIN32)
-
-#if defined(SEARCH_BOX_IMPLEMENTATION)
-#define SEARCH_BOX_EXPORT __declspec(dllexport)
-#else
-#define SEARCH_BOX_EXPORT __declspec(dllimport)
-#endif  // defined(SEARCH_BOX_IMPLEMENTATION)
-
-#else  // defined(WIN32)
-#if defined(SEARCH_BOX_IMPLEMENTATION)
-#define SEARCH_BOX_EXPORT __attribute__((visibility("default")))
-#else
-#define SEARCH_BOX_EXPORT
-#endif
-#endif
-
-#else  // defined(COMPONENT_BUILD)
-#define SEARCH_BOX_EXPORT
-#endif
-
-#endif  // ASH_SEARCH_BOX_SEARCH_BOX_EXPORT_H_

ash/search_box/search_box_view_base.cc

@@ -33,7 +33,7 @@
 #include "ui/views/layout/layout_provider.h"
 #include "ui/views/widget/widget.h"
 
-namespace search_box {
+namespace ash {
 
 namespace {
 
@@ -95,7 +95,7 @@ class SearchBoxImageButton : public views::ImageButton {
     // InkDropState will reset after clicking.
     SetHasInkDropActionOnClick(true);
 
-    SetPreferredSize({kButtonSizeDip, kButtonSizeDip});
+    SetPreferredSize({kSearchBoxButtonSizeDip, kSearchBoxButtonSizeDip});
     SetImageHorizontalAlignment(ALIGN_CENTER);
     SetImageVerticalAlignment(ALIGN_MIDDLE);
 
@@ -244,7 +244,8 @@ SearchBoxViewBase::SearchBoxViewBase(SearchBoxViewDelegate* delegate)
 
   box_layout_ =
       content_container_->SetLayoutManager(std::make_unique<views::BoxLayout>(
-          views::BoxLayout::Orientation::kHorizontal, gfx::Insets(0, kPadding),
+          views::BoxLayout::Orientation::kHorizontal,
+          gfx::Insets(0, kSearchBoxPadding),
           kInnerPadding -
               views::LayoutProvider::Get()->GetDistanceMetric(
                   views::DISTANCE_TEXTFIELD_HORIZONTAL_TEXT_PADDING)));
@@ -274,7 +275,7 @@ SearchBoxViewBase::SearchBoxViewBase(SearchBoxViewDelegate* delegate)
 
   // An invisible space view to align |search_box_| to center.
   search_box_right_space_ = new views::View();
-  search_box_right_space_->SetPreferredSize(gfx::Size(kIconSize, 0));
+  search_box_right_space_->SetPreferredSize(gfx::Size(kSearchBoxIconSize, 0));
   content_container_->AddChildView(search_box_right_space_);
 
   assistant_button_ = new SearchBoxImageButton(this);
@@ -555,4 +556,4 @@ views::Background* SearchBoxViewBase::GetSearchBoxBackground() {
   return content_container_->background();
 }
 
-}  // namespace search_box
+}  // namespace ash

ash/search_box/search_box_view_base.h

@@ -8,7 +8,6 @@
 #include <vector>
 
 #include "ash/search_box/search_box_constants.h"
-#include "ash/search_box/search_box_export.h"
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/strings/string16.h"
@@ -29,7 +28,7 @@ class Textfield;
 class View;
 }  // namespace views
 
-namespace search_box {
+namespace ash {
 
 class SearchBoxViewDelegate;
 class SearchBoxImageButton;
@@ -51,9 +50,9 @@ enum class ActivationSource {
 // inputting queries and triggering callbacks. The icons include a search icon,
 // a close icon and a back icon for different functionalities. This class
 // provides common functions for the search box view across Chrome OS.
-class SEARCH_BOX_EXPORT SearchBoxViewBase : public views::WidgetDelegateView,
-                                            public views::TextfieldController,
-                                            public views::ButtonListener {
+class SearchBoxViewBase : public views::WidgetDelegateView,
+                          public views::TextfieldController,
+                          public views::ButtonListener {
  public:
   explicit SearchBoxViewBase(SearchBoxViewDelegate* delegate);
   ~SearchBoxViewBase() override;
@@ -218,6 +217,6 @@ class SEARCH_BOX_EXPORT SearchBoxViewBase : public views::WidgetDelegateView,
   DISALLOW_COPY_AND_ASSIGN(SearchBoxViewBase);
 };
 
-}  // namespace search_box
+}  // namespace ash
 
 #endif  // ASH_SEARCH_BOX_SEARCH_BOX_VIEW_BASE_H_

ash/search_box/search_box_view_delegate.h

@@ -5,13 +5,11 @@
 #ifndef ASH_SEARCH_BOX_SEARCH_BOX_VIEW_DELEGATE_H_
 #define ASH_SEARCH_BOX_SEARCH_BOX_VIEW_DELEGATE_H_
 
-#include "ash/search_box/search_box_export.h"
-
-namespace search_box {
+namespace ash {
 
 class SearchBoxViewBase;
 
-class SEARCH_BOX_EXPORT SearchBoxViewDelegate {
+class SearchBoxViewDelegate {
  public:
   // Invoked when query text has changed by the user.
   virtual void QueryChanged(SearchBoxViewBase* sender) = 0;
@@ -32,6 +30,6 @@ class SEARCH_BOX_EXPORT SearchBoxViewDelegate {
   virtual ~SearchBoxViewDelegate() {}
 };
 
-}  // namespace search_box
+}  // namespace ash
 
 #endif  // ASH_SEARCH_BOX_SEARCH_BOX_VIEW_DELEGATE_H_

ash/shortcut_viewer/views/keyboard_shortcut_view.cc

@@ -307,7 +307,7 @@ void KeyboardShortcutView::OnPaint(gfx::Canvas* canvas) {
                                 weak_factory_.GetWeakPtr(), kAllCategories));
 }
 
-void KeyboardShortcutView::QueryChanged(search_box::SearchBoxViewBase* sender) {
+void KeyboardShortcutView::QueryChanged(ash::SearchBoxViewBase* sender) {
   const bool query_empty = sender->IsSearchBoxTrimmedQueryEmpty();
   if (is_search_box_empty_ != query_empty) {
     is_search_box_empty_ = query_empty;
@@ -333,8 +333,7 @@ void KeyboardShortcutView::BackButtonPressed() {
   search_box_view_->SetSearchBoxActive(false, ui::ET_UNKNOWN);
 }
 
-void KeyboardShortcutView::ActiveChanged(
-    search_box::SearchBoxViewBase* sender) {
+void KeyboardShortcutView::ActiveChanged(ash::SearchBoxViewBase* sender) {
   const bool is_search_box_active = sender->is_search_box_active();
   is_search_box_empty_ = sender->IsSearchBoxTrimmedQueryEmpty();
   sender->ShowBackOrGoogleIcon(is_search_box_active);

ash/shortcut_viewer/views/keyboard_shortcut_view.h

@@ -32,7 +32,7 @@ enum class ShortcutCategory;
 
 // The UI container for Ash and Chrome keyboard shortcuts.
 class KeyboardShortcutView : public views::WidgetDelegateView,
-                             public search_box::SearchBoxViewDelegate {
+                             public ash::SearchBoxViewDelegate {
  public:
   ~KeyboardShortcutView() override;
 
@@ -52,12 +52,12 @@ class KeyboardShortcutView : public views::WidgetDelegateView,
   gfx::Size CalculatePreferredSize() const override;
   void OnPaint(gfx::Canvas* canvas) override;
 
-  // search_box::SearchBoxViewDelegate:
-  void QueryChanged(search_box::SearchBoxViewBase* sender) override;
+  // SearchBoxViewDelegate:
+  void QueryChanged(ash::SearchBoxViewBase* sender) override;
   void AssistantButtonPressed() override {}
   void BackButtonPressed() override;
-  void ActiveChanged(search_box::SearchBoxViewBase* sender) override;
-  void SearchBoxFocusChanged(search_box::SearchBoxViewBase* sender) override {}
+  void ActiveChanged(ash::SearchBoxViewBase* sender) override;
+  void SearchBoxFocusChanged(ash::SearchBoxViewBase* sender) override {}
 
  private:
   friend class KeyboardShortcutViewTest;

ash/shortcut_viewer/views/ksv_search_box_view.cc

@@ -30,8 +30,8 @@ constexpr int kBorderCornerRadius = 32;
 
 }  // namespace
 
-KSVSearchBoxView::KSVSearchBoxView(search_box::SearchBoxViewDelegate* delegate)
-    : search_box::SearchBoxViewBase(delegate) {
+KSVSearchBoxView::KSVSearchBoxView(ash::SearchBoxViewDelegate* delegate)
+    : ash::SearchBoxViewBase(delegate) {
   SetSearchBoxBackgroundCornerRadius(kBorderCornerRadius);
   UpdateBackgroundColor(kDefaultSearchBoxBackgroundColor);
   search_box()->SetBackgroundColor(SK_ColorTRANSPARENT);

ash/shortcut_viewer/views/ksv_search_box_view.h

@@ -9,16 +9,16 @@
 #include "base/macros.h"
 #include "base/strings/string16.h"
 
-namespace search_box {
+namespace ash {
 class SearchBoxViewDelegate;
-}  // namespace search_box
+}  // namespace ash
 
 namespace keyboard_shortcut_viewer {
 
 // A search_box_SearchBoxViewBase implementation for KeyboardShortcutViewer.
-class KSVSearchBoxView : public search_box::SearchBoxViewBase {
+class KSVSearchBoxView : public ash::SearchBoxViewBase {
  public:
-  explicit KSVSearchBoxView(search_box::SearchBoxViewDelegate* delegate);
+  explicit KSVSearchBoxView(ash::SearchBoxViewDelegate* delegate);
   ~KSVSearchBoxView() override = default;
 
   // views::View:
@@ -32,7 +32,7 @@ class KSVSearchBoxView : public search_box::SearchBoxViewBase {
   void SetAccessibleValue(const base::string16& value);
 
  private:
-  // search_box::SearchBoxViewBase:
+  // SearchBoxViewBase:
   void UpdateBackgroundColor(SkColor color) override;
   void UpdateSearchBoxBorder() override;
   void SetupCloseButton() override;