Adds the speech recognition button to the app-list searchbox.

ui/app_list/views/search_box_view.cc

 // Copyright (c) 2012 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 <algorithm>
 
 #include "grit/ui_resources.h"
 #include "ui/app_list/app_list_model.h"
+#include "ui/app_list/app_list_view_delegate.h"
 #include "ui/app_list/search_box_model.h"
 #include "ui/app_list/views/app_list_menu_views.h"
 #include "ui/app_list/views/search_box_view_delegate.h"
+#include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/events/event.h"
+#include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/textfield/textfield.h"
 
 namespace app_list {
 
 namespace {
 
 const int kPadding = 14;
 const int kIconDimension = 32;
@@ skipping 11 matching lines @@
 
 }  // namespace
 
 SearchBoxView::SearchBoxView(SearchBoxViewDelegate* delegate,
                              AppListViewDelegate* view_delegate,
                              AppListModel* model)
     : delegate_(delegate),
       view_delegate_(view_delegate),
       model_(model),
       icon_view_(new views::ImageView),
+      right_button_(NULL),
       search_box_(new views::Textfield),
       contents_view_(NULL) {
   DCHECK(model_);
   AddChildView(icon_view_);
 
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
 
 #if !defined(OS_CHROMEOS)
   menu_button_ = new views::MenuButton(NULL, base::string16(), this, false);
   menu_button_->set_border(NULL);
   menu_button_->SetIcon(*rb.GetImageSkiaNamed(IDR_APP_LIST_TOOLS_NORMAL));
   menu_button_->SetHoverIcon(*rb.GetImageSkiaNamed(IDR_APP_LIST_TOOLS_HOVER));
   menu_button_->SetPushedIcon(*rb.GetImageSkiaNamed(
       IDR_APP_LIST_TOOLS_PRESSED));
   AddChildView(menu_button_);
 #endif
 
   search_box_->RemoveBorder();
   search_box_->SetFont(rb.GetFont(ui::ResourceBundle::MediumFont));
   search_box_->set_placeholder_text_color(kHintTextColor);
   search_box_->SetController(this);
   AddChildView(search_box_);
 
   model_->search_box()->AddObserver(this);
   IconChanged();
+  RightButtonPropChanged();
   HintTextChanged();
 }
 
 SearchBoxView::~SearchBoxView() {
   model_->search_box()->RemoveObserver(this);
 }
 
 bool SearchBoxView::HasSearch() const {
   return !search_box_->text().empty();
 }
@@ skipping 16 matching lines @@
 
 void SearchBoxView::Layout() {
   gfx::Rect rect(GetContentsBounds());
   if (rect.IsEmpty())
     return;
 
   gfx::Rect icon_frame(rect);
   icon_frame.set_width(kIconDimension + 2 * kPadding);
   icon_view_->SetBoundsRect(icon_frame);
 
+  // Empty if right icon doesn't exist.
+  gfx::Rect right_button_frame;
+  if (right_button_) {
+    right_button_frame = icon_frame;
+    right_button_frame.set_x(rect.right() - icon_frame.width());
+    gfx::Size button_size = right_button_->GetPreferredSize();
+    gfx::Point button_origin = right_button_frame.CenterPoint();
+    button_origin.Offset(-button_size.width() / 2, -button_size.height() / 2);
+    right_button_->SetBoundsRect(gfx::Rect(button_origin, button_size));
+  }
+
   gfx::Rect menu_button_frame(rect);
 #if !defined(OS_CHROMEOS)
   menu_button_frame.set_width(kMenuButtonDimension);
   menu_button_frame.set_x(rect.right() - menu_button_frame.width() - kPadding);
   menu_button_frame.ClampToCenteredSize(gfx::Size(menu_button_frame.width(),
                                                   kMenuButtonDimension));
   menu_button_->SetBoundsRect(menu_button_frame);
 #else
   menu_button_frame.set_width(0);
 #endif
 
   gfx::Rect edit_frame(rect);
   edit_frame.set_x(icon_frame.right());
-  edit_frame.set_width(
-      rect.width() - icon_frame.width() - kPadding - menu_button_frame.width());
+  int edit_frame_width =
+      rect.width() - icon_frame.width() - kPadding - menu_button_frame.width();
+  if (!right_button_frame.IsEmpty())
+    edit_frame_width -= right_button_frame.width() + kPadding;
+  edit_frame.set_width(edit_frame_width);
   edit_frame.ClampToCenteredSize(
       gfx::Size(edit_frame.width(), search_box_->GetPreferredSize().height()));
   search_box_->SetBoundsRect(edit_frame);
 }
 
 bool SearchBoxView::OnMouseWheel(const ui::MouseWheelEvent& event) {
   if (contents_view_)
     return contents_view_->OnMouseWheel(event);
 
   return false;
@@ skipping 20 matching lines @@
 
 bool SearchBoxView::HandleKeyEvent(views::Textfield* sender,
                                    const ui::KeyEvent& key_event) {
   bool handled = false;
   if (contents_view_ && contents_view_->visible())
     handled = contents_view_->OnKeyPressed(key_event);
 
   return handled;
 }
 
+void SearchBoxView::ButtonPressed(views::Button* sender,
+                                  const ui::Event& event) {
+  DCHECK(!right_button_ && sender == right_button_);
+  view_delegate_->OnRightButtonClicked();
+}
+
 void SearchBoxView::OnMenuButtonClicked(View* source, const gfx::Point& point) {
   if (!menu_)
     menu_.reset(new AppListMenuViews(view_delegate_));
 
   const gfx::Point menu_location =
       menu_button_->GetBoundsInScreen().bottom_right() +
       gfx::Vector2d(kMenuXOffsetFromButton, kMenuYOffsetFromButton);
   menu_->RunMenuAt(menu_button_, menu_location);
 }
 
 void SearchBoxView::IconChanged() {
   icon_view_->SetImage(model_->search_box()->icon());
 }
 
+void SearchBoxView::RightButtonPropChanged() {
+  const SearchBoxModel::RightButtonProperty* right_button_prop =
+      model_->search_box()->right_button();
+  if (right_button_prop) {
+    if (!right_button_) {
+      right_button_ = new views::ToggleImageButton(this);
+      AddChildView(right_button_);
+    }
+    right_button_->SetImage(views::Button::STATE_NORMAL,
+                            &right_button_prop->icon);
+    right_button_->SetToggledImage(views::Button::STATE_NORMAL,
+                                   &right_button_prop->toggled_icon);
+    right_button_->SetTooltipText(right_button_prop->tooltip);
+    right_button_->SetToggledTooltipText(right_button_prop->toggled_tooltip);
+  } else {
+    if (right_button_) {
+      // Deleting a view will detach it from its parent.
+      delete right_button_;
+      right_button_ = NULL;
+    }
+  }
+}
+
+void SearchBoxView::RightButtonStateChanged(bool toggled) {
+  if (right_button_)
+    right_button_->SetToggled(toggled);
+}
+
 void SearchBoxView::HintTextChanged() {
   search_box_->set_placeholder_text(model_->search_box()->hint_text());
 }
 
 void SearchBoxView::SelectionModelChanged() {
   search_box_->SelectSelectionModel(model_->search_box()->selection_model());
 }
 
 void SearchBoxView::TextChanged() {
   search_box_->SetText(model_->search_box()->text());
   NotifyQueryChanged();
 }
 
 }  // namespace app_list