Aura: Set focusable on textfield but not on location bar

chrome/browser/ui/views/location_bar/location_bar_view.cc

 // Copyright (c) 2011 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"
 
 #if defined(TOOLKIT_USES_GTK)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 39 matching lines @@
 #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/resource/resource_bundle.h"
 #include "ui/base/theme_provider.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/views/controls/label.h"
-#include "ui/views/controls/textfield/native_textfield_views.h"
 #include "ui/views/drag_utils.h"
 
 #if !defined(OS_CHROMEOS)
 #include "chrome/browser/ui/views/first_run_bubble.h"
 #endif
 
 #if defined(OS_WIN) || defined(USE_AURA)
 #include "chrome/browser/ui/views/location_bar/suggested_text_view.h"
 #endif
 
 using views::View;
 
 namespace {
 
 TabContents* GetTabContentsFromDelegate(LocationBarView::Delegate* delegate) {
   const TabContentsWrapper* wrapper = delegate->GetTabContentsWrapper();
   return wrapper ? wrapper->tab_contents() : NULL;
 }
 
+// A utility function to cast OmniboxView to OmniboxViewViews.
+OmniboxViewViews* AsViews(OmniboxView* view) {

[alicet1, 2011/12/07 22:16:13]

is it better as a static conversion method on OmniboxViewViews or a member in
OmniboxView rather than here?

[oshima, 2011/12/08 19:13:01]

Only implementation needs this, and I prefer function in anonymous namespace
than private static function because it makes C++ header light weight.

+  DCHECK(views::Widget::IsPureViews());
+  return static_cast<OmniboxViewViews*>(view);
+}
+
 }  // namespace
 
 // static
 const int LocationBarView::kNormalHorizontalEdgeThickness = 1;
 const int LocationBarView::kVerticalEdgeThickness = 2;
 const int LocationBarView::kItemPadding = 3;
 const int LocationBarView::kIconInternalPadding = 2;
 const int LocationBarView::kEdgeItemPadding = kItemPadding;
 const int LocationBarView::kBubbleHorizontalPadding = 1;
 const char LocationBarView::kViewClassName[] =
@@ skipping 37 matching lines @@
       suggested_text_view_(NULL),
 #endif
       keyword_hint_view_(NULL),
       star_view_(NULL),
       mode_(mode),
       show_focus_rect_(false),
       bubble_type_(FirstRun::MINIMAL_BUBBLE),
       template_url_service_(NULL),
       animation_offset_(0) {
   set_id(VIEW_ID_LOCATION_BAR);
-  set_focusable(true);
 
   if (mode_ == NORMAL) {
     painter_.reset(
         views::Painter::CreateImagePainter(
             *ResourceBundle::GetSharedInstance().GetImageNamed(
                 IDR_LOCATION_BAR_BORDER).ToSkBitmap(),
             gfx::Insets(kBorderRoundCornerHeight, kBorderRoundCornerWidth,
                 kBorderRoundCornerHeight, kBorderRoundCornerWidth),
             true));
   }
@@ skipping 38 matching lines @@
   // URL edit field.
   // View container for URL edit field.
   Profile* profile = browser_->profile();
   location_entry_.reset(OmniboxView::CreateOmniboxView(
       this,
       model_,
       profile,
       browser_->command_updater(),
       mode_ == POPUP,
       this));
+  SetOmniboxFocusable(true);
 
   location_entry_view_ = location_entry_->AddToView(this);
   location_entry_view_->set_id(VIEW_ID_AUTOCOMPLETE);
 
   selected_keyword_view_ = new SelectedKeywordView(
       kSelectedKeywordBackgroundImages, IDR_KEYWORD_SEARCH_MAGNIFIER,
       GetColor(ToolbarModel::NONE, TEXT), profile);
   AddChildView(selected_keyword_view_);
   selected_keyword_view_->SetFont(font_);
   selected_keyword_view_->SetVisible(false);
@@ skipping 231 matching lines @@
 
   Layout();
   SchedulePaint();
 }
 
 string16 LocationBarView::GetInstantSuggestion() const {
   return HasValidSuggestText() ? suggested_text_view_->GetText() : string16();
 }
 #endif
 
+void LocationBarView::SetOmniboxFocusable(bool focusable) {
+  if (views::Widget::IsPureViews())
+    AsViews(location_entry_.get())->SetOmniboxFocusable(focusable);
+  else
+    set_focusable(focusable);
+}
+
+bool LocationBarView::IsOmniboxFocusableInRootView() const {
+  return views::Widget::IsPureViews() ?
+      AsViews(location_entry_.get())->IsOmniboxFocusableInRootView() :
+      views::View::IsFocusableInRootView();
+}
+
 gfx::Size LocationBarView::GetPreferredSize() {
   return gfx::Size(0, GetThemeProvider()->GetBitmapNamed(mode_ == POPUP ?
       IDR_LOCATIONBG_POPUPMODE_CENTER : IDR_LOCATIONBG_C)->height());
 }
 
 void LocationBarView::Layout() {
   if (!location_entry_.get())
     return;
 
   // TODO(jhawkins): Remove once crbug.com/101994 is fixed.
@@ skipping 773 matching lines @@
       !suggested_text_view_->GetText().empty();
 }
 
 #if !defined(USE_AURA)
 OmniboxViewWin* LocationBarView::GetOmniboxViewWin() {
   CHECK(!views::Widget::IsPureViews());
   return static_cast<OmniboxViewWin*>(location_entry_.get());
 }
 #endif
 #endif