| Index: chrome/browser/ui/views/autocomplete/touch_autocomplete_popup_contents_view.cc | 
| diff --git a/chrome/browser/ui/views/autocomplete/touch_autocomplete_popup_contents_view.cc b/chrome/browser/ui/views/autocomplete/touch_autocomplete_popup_contents_view.cc | 
| deleted file mode 100644 | 
| index 6b1af647ef6d9ced3c2a7fbca82e82aa9de18bdc..0000000000000000000000000000000000000000 | 
| --- a/chrome/browser/ui/views/autocomplete/touch_autocomplete_popup_contents_view.cc | 
| +++ /dev/null | 
| @@ -1,119 +0,0 @@ | 
| -// 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 "chrome/browser/ui/views/autocomplete/touch_autocomplete_popup_contents_view.h" | 
| - | 
| -#include "chrome/browser/ui/omnibox/omnibox_view.h" | 
| -#include "third_party/skia/include/core/SkPaint.h" | 
| -#include "ui/gfx/canvas.h" | 
| -#include "ui/gfx/font.h" | 
| -#include "ui/gfx/path.h" | 
| -#include "ui/gfx/rect.h" | 
| -#include "ui/gfx/size.h" | 
| -#include "ui/views/view.h" | 
| - | 
| -// TouchAutocompleteResultView ------------------------------------------------ | 
| - | 
| -TouchAutocompleteResultView::TouchAutocompleteResultView( | 
| -    AutocompleteResultViewModel* model, | 
| -    int model_index, | 
| -    const gfx::Font& font, | 
| -    const gfx::Font& bold_font) | 
| -    : AutocompleteResultView(model, model_index, font, bold_font) { | 
| -  set_edge_item_padding(8); | 
| -  set_item_padding(8); | 
| -  set_minimum_text_vertical_padding(10); | 
| -} | 
| - | 
| -TouchAutocompleteResultView::~TouchAutocompleteResultView() { | 
| -} | 
| - | 
| -void TouchAutocompleteResultView::PaintMatch(gfx::Canvas* canvas, | 
| -                                             const AutocompleteMatch& match, | 
| -                                             int x) { | 
| -  int y = text_bounds().y(); | 
| - | 
| -  if (!match.description.empty()) { | 
| -    // We use our base class's GetTextHeight below because we need the height | 
| -    // of a single line of text. | 
| -    DrawString(canvas, match.description, match.description_class, true, x, y); | 
| -    y += AutocompleteResultView::GetTextHeight(); | 
| -  } else { | 
| -    // When we have only one line of content (no description), we center the | 
| -    // single line vertically on our two-lines-tall results box. | 
| -    y += AutocompleteResultView::GetTextHeight() / 2; | 
| -  } | 
| - | 
| -  DrawString(canvas, match.contents, match.contents_class, false, x, y); | 
| -} | 
| - | 
| -int TouchAutocompleteResultView::GetTextHeight() const { | 
| -  return AutocompleteResultView::GetTextHeight() * 2; | 
| -} | 
| - | 
| -// TouchAutocompletePopupContentsView ----------------------------------------- | 
| - | 
| -TouchAutocompletePopupContentsView::TouchAutocompletePopupContentsView( | 
| -    const gfx::Font& font, | 
| -    OmniboxView* omnibox_view, | 
| -    AutocompleteEditModel* edit_model, | 
| -    views::View* location_bar) | 
| -    : AutocompletePopupContentsView(font, omnibox_view, edit_model, | 
| -                                    location_bar) { | 
| -} | 
| - | 
| -TouchAutocompletePopupContentsView::~TouchAutocompletePopupContentsView() { | 
| -} | 
| - | 
| -void TouchAutocompletePopupContentsView::UpdatePopupAppearance() { | 
| -  AutocompletePopupContentsView::UpdatePopupAppearance(); | 
| -  Layout(); | 
| -} | 
| - | 
| -void TouchAutocompletePopupContentsView::PaintResultViews(gfx::Canvas* canvas) { | 
| -  AutocompletePopupContentsView::PaintResultViews(canvas); | 
| - | 
| -  // Draw divider lines. | 
| -  std::vector<View*> visible_children(GetVisibleChildren()); | 
| -  if (visible_children.size() < 2) | 
| -    return; | 
| -  gfx::Rect bounds(GetContentsBounds()); | 
| - | 
| -  // Draw a line at the bottom of each child except the last.  The | 
| -  // color of the line is determined to blend appropriately with the | 
| -  // most dominant of the two surrounding cells, in precedence order, | 
| -  // i.e. selected > hovered > normal. | 
| -  for (std::vector<View*>::const_iterator i(visible_children.begin()); | 
| -       i + 1 != visible_children.end(); ++i) { | 
| -    TouchAutocompleteResultView* child = | 
| -        static_cast<TouchAutocompleteResultView*>(*i); | 
| -    TouchAutocompleteResultView* next_child = | 
| -        static_cast<TouchAutocompleteResultView*>(*(i + 1)); | 
| -    SkColor divider_color = AutocompleteResultView::GetColor( | 
| -        std::max(child->GetState(), next_child->GetState()), | 
| -        AutocompleteResultView::DIVIDER); | 
| -    int line_y = child->y() + child->height() - 1; | 
| -    canvas->DrawLine(gfx::Point(bounds.x(), line_y), | 
| -                     gfx::Point(bounds.right(), line_y), divider_color); | 
| -  } | 
| -} | 
| - | 
| -AutocompleteResultView* TouchAutocompletePopupContentsView::CreateResultView( | 
| -    AutocompleteResultViewModel* model, | 
| -    int model_index, | 
| -    const gfx::Font& font, | 
| -    const gfx::Font& bold_font) { | 
| -  return new TouchAutocompleteResultView(model, model_index, font, bold_font); | 
| -} | 
| - | 
| -std::vector<views::View*> | 
| -    TouchAutocompletePopupContentsView::GetVisibleChildren() { | 
| -  std::vector<View*> visible_children; | 
| -  for (int i = 0; i < child_count(); ++i) { | 
| -    View* v = child_at(i); | 
| -    if (child_at(i)->visible()) | 
| -      visible_children.push_back(v); | 
| -  } | 
| -  return visible_children; | 
| -} | 
|  |