First stab at touch optimized omnibox auto-complete per sgabriel's mocks.

chrome/browser/ui/views/location_bar/location_bar_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 "chrome/browser/ui/views/location_bar/location_bar_view.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/command_line.h"
@@ skipping 32 matching lines @@
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/theme_resources_standard.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/theme_provider.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/views/button_drag_utils.h"
 #include "ui/views/controls/label.h"
 
 #if !defined(OS_CHROMEOS)
@@ skipping 19 matching lines @@
   return static_cast<OmniboxViewViews*>(view);
 }
 
 // Height of the location bar's round corner region.
 const int kBorderRoundCornerHeight = 5;
 // Width of location bar's round corner region.
 const int kBorderRoundCornerWidth = 4;
 // Radius of the round corners inside the location bar.
 const int kBorderCornerRadius = 2;
 
+const int kDesktopItemPadding = 3;
+const int kDesktopEdgeItemPadding = kDesktopItemPadding;
+
+const int kTouchItemPadding = 8;
+const int kTouchEdgeItemPadding = kTouchItemPadding;
+
 }  // namespace
 
 // static
 const int LocationBarView::kNormalHorizontalEdgeThickness = 2;
 const int LocationBarView::kVerticalEdgeThickness = 3;
-const int LocationBarView::kItemPadding = 3;
 const int LocationBarView::kIconInternalPadding = 2;
-const int LocationBarView::kEdgeItemPadding = kItemPadding;
 const int LocationBarView::kBubbleHorizontalPadding = 1;
 const char LocationBarView::kViewClassName[] =
     "browser/ui/views/location_bar/LocationBarView";
 
 static const int kEVBubbleBackgroundImages[] = {
   IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_L,
   IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_C,
   IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_R,
 };
 
@@ skipping 186 matching lines @@
       return color_utils::GetReadableColor(color, GetColor(security_level,
                                                            BACKGROUND));
     }
 
     default:
       NOTREACHED();
       return GetColor(security_level, TEXT);
   }
 }
 
+// static
+int LocationBarView::GetItemPadding() {
+  if (ui::GetDisplayLayout() == ui::LAYOUT_TOUCH) {

[Peter Kasting, 2012/05/11 23:01:41]

Nit: No else after return; just do

  return (ui::GetDisplayLayout() == ui::LAYOUT_TOUCH) ?
      kTouchItemPadding : kDesktopItemPadding;

(2 places)

[Jói, 2012/05/14 18:29:45]

Done.

+    return kTouchItemPadding;
+  } else {
+    return kDesktopItemPadding;
+  }
+}
+
+// static
+int LocationBarView::GetEdgeItemPadding() {
+  if (ui::GetDisplayLayout() == ui::LAYOUT_TOUCH) {
+    return kTouchEdgeItemPadding;
+  } else {
+    return kDesktopItemPadding;
+  }
+}
+
 // DropdownBarHostDelegate
 void LocationBarView::SetFocusAndSelection(bool select_all) {
   FocusLocation(select_all);
 }
 
 void LocationBarView::SetAnimationOffset(int offset) {
   animation_offset_ = offset;
 }
 
 void LocationBarView::Update(const WebContents* tab_for_state_restoring) {
@@ skipping 190 matching lines @@
   int location_height = std::max(height() - (kVerticalEdgeThickness * 2), 0);
 
   // The edge stroke is 1 px thick.  In popup mode, the edges are drawn by the
   // omnibox' parent, so there isn't any edge to account for at all.
   const int kEdgeThickness = (mode_ == NORMAL) ?
       kNormalHorizontalEdgeThickness : 0;
   // The edit has 1 px of horizontal whitespace inside it before the text.
   const int kEditInternalSpace = 1;
   // The space between an item and the edit is the normal item space, minus the
   // edit's built-in space (so the apparent space will be the same).
-  const int kItemEditPadding =
-      LocationBarView::kItemPadding - kEditInternalSpace;
-  const int kEdgeEditPadding =
-      LocationBarView::kEdgeItemPadding - kEditInternalSpace;
+  const int kItemEditPadding = GetItemPadding() - kEditInternalSpace;
+  const int kEdgeEditPadding = GetEdgeItemPadding() - kEditInternalSpace;
   const int kBubbleVerticalPadding = (mode_ == POPUP) ?
       -1 : kBubbleHorizontalPadding;
 
   // Start by reserving the padding at the right edge.
-  int entry_width = width() - kEdgeThickness - kEdgeItemPadding;
+  int entry_width = width() - kEdgeThickness - GetEdgeItemPadding();
 
   // |location_icon_view_| is visible except when |ev_bubble_view_| or
   // |selected_keyword_view_| are visible.
   int location_icon_width = 0;
   int ev_bubble_width = 0;
   location_icon_view_->SetVisible(false);
   ev_bubble_view_->SetVisible(false);
   const string16 keyword(location_entry_->model()->keyword());
   const bool is_keyword_hint(location_entry_->model()->is_keyword_hint());
   const bool show_selected_keyword = !keyword.empty() && !is_keyword_hint;
   if (show_selected_keyword) {
     // Assume the keyword might be hidden.
     entry_width -= (kEdgeThickness + kEdgeEditPadding);
   } else if (model_->GetSecurityLevel() == ToolbarModel::EV_SECURE) {
     ev_bubble_view_->SetVisible(true);
     ev_bubble_view_->SetLabel(model_->GetEVCertName());
     ev_bubble_width = ev_bubble_view_->GetPreferredSize().width();
     // We'll adjust this width and take it out of |entry_width| below.
   } else {
     location_icon_view_->SetVisible(true);
     location_icon_width = location_icon_view_->GetPreferredSize().width();
-    entry_width -= (kEdgeThickness + kEdgeItemPadding + location_icon_width +
-        kItemEditPadding);
+    entry_width -= (kEdgeThickness + GetEdgeItemPadding() +
+                    location_icon_width + kItemEditPadding);
   }
 
   if (star_view_ && star_view_->visible())
-    entry_width -= star_view_->GetPreferredSize().width() + kItemPadding;
+    entry_width -= star_view_->GetPreferredSize().width() + GetItemPadding();
   if (chrome_to_mobile_view_ && chrome_to_mobile_view_->visible())
     entry_width -= chrome_to_mobile_view_->GetPreferredSize().width() +
-                   kItemPadding;
+        GetItemPadding();
   for (PageActionViews::const_iterator i(page_action_views_.begin());
        i != page_action_views_.end(); ++i) {
     if ((*i)->visible())
-      entry_width -= ((*i)->GetPreferredSize().width() + kItemPadding);
+      entry_width -= ((*i)->GetPreferredSize().width() + GetItemPadding());
   }
   for (ContentSettingViews::const_iterator i(content_setting_views_.begin());
        i != content_setting_views_.end(); ++i) {
     if ((*i)->visible())
-      entry_width -= ((*i)->GetPreferredSize().width() + kItemPadding);
+      entry_width -= ((*i)->GetPreferredSize().width() + GetItemPadding());
   }
   // The gap between the edit and whatever is to its right is shortened.
   entry_width += kEditInternalSpace;
 
   // Size the EV bubble after taking star/ChromeToMobile/page actions/content
   // settings out of |entry_width| so we won't take too much space.
   if (ev_bubble_width) {
     // Try to elide the bubble to be no larger than half the total available
     // space, but never elide it any smaller than 150 px.
     static const int kMinElidedBubbleWidth = 150;
@@ skipping 31 matching lines @@
             *rb.GetBitmapNamed(IDR_OMNIBOX_SEARCH));
         selected_keyword_view_->set_is_extension_icon(false);
       }
     }
   } else if (show_keyword_hint) {
     if (keyword_hint_view_->keyword() != keyword)
       keyword_hint_view_->SetKeyword(keyword);
   }
 
   // Lay out items to the right of the edit field.
-  int offset = width() - kEdgeThickness - kEdgeItemPadding;
+  int offset = width() - kEdgeThickness - GetEdgeItemPadding();
   if (star_view_ && star_view_->visible()) {
     int star_width = star_view_->GetPreferredSize().width();
     offset -= star_width;
     star_view_->SetBounds(offset, location_y, star_width, location_height);
-    offset -= kItemPadding;
+    offset -= GetItemPadding();
   }
 
   if (chrome_to_mobile_view_ && chrome_to_mobile_view_->visible()) {
     int icon_width = chrome_to_mobile_view_->GetPreferredSize().width();
     offset -= icon_width;
     chrome_to_mobile_view_->SetBounds(offset, location_y,
                                       icon_width, location_height);
-    offset -= kItemPadding;
+    offset -= GetItemPadding();
   }
 
   for (PageActionViews::const_iterator i(page_action_views_.begin());
        i != page_action_views_.end(); ++i) {
     if ((*i)->visible()) {
       int page_action_width = (*i)->GetPreferredSize().width();
       offset -= page_action_width;
       (*i)->SetBounds(offset, location_y, page_action_width, location_height);
-      offset -= kItemPadding;
+      offset -= GetItemPadding();
     }
   }
   // We use a reverse_iterator here because we're laying out the views from
   // right to left but in the vector they're ordered left to right.
   for (ContentSettingViews::const_reverse_iterator
        i(content_setting_views_.rbegin()); i != content_setting_views_.rend();
        ++i) {
     if ((*i)->visible()) {
       int content_blocked_width = (*i)->GetPreferredSize().width();
       offset -= content_blocked_width;
       (*i)->SetBounds(offset, location_y, content_blocked_width,
                       location_height);
-      offset -= kItemPadding;
+      offset -= GetItemPadding();
     }
   }
 
   // Now lay out items to the left of the edit field.
   if (location_icon_view_->visible()) {
-    location_icon_view_->SetBounds(kEdgeThickness + kEdgeItemPadding,
+    location_icon_view_->SetBounds(kEdgeThickness + GetEdgeItemPadding(),
         location_y, location_icon_width, location_height);
     offset = location_icon_view_->bounds().right() + kItemEditPadding;
   } else if (ev_bubble_view_->visible()) {
     ev_bubble_view_->SetBounds(kEdgeThickness + kBubbleHorizontalPadding,
         location_y + kBubbleVerticalPadding, ev_bubble_width,
         ev_bubble_view_->GetPreferredSize().height());
     offset = ev_bubble_view_->bounds().right() + kItemEditPadding;
   } else {
     offset = kEdgeThickness +
         (show_selected_keyword ? kBubbleHorizontalPadding : kEdgeEditPadding);
@@ skipping 599 matching lines @@
   return suggested_text_view_ && !suggested_text_view_->size().IsEmpty() &&
       !suggested_text_view_->text().empty();
 }
 
 #if !defined(USE_AURA)
 OmniboxViewWin* LocationBarView::GetOmniboxViewWin() {
   return static_cast<OmniboxViewWin*>(location_entry_.get());
 }
 #endif
 #endif