Small tweaks to improve toolbar keyboard accessibility: Put focus rects...

chrome/browser/views/location_bar/location_bar_view.cc

 // Copyright (c) 2010 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/views/location_bar/location_bar_view.h"
 
 #if defined(OS_LINUX)
 #include <gtk/gtk.h>
 #endif
 
+#include "app/l10n_util.h"

[sky, 2010/06/21 20:55:32]

after app/drag...

 #include "app/drag_drop_types.h"
 #include "app/resource_bundle.h"
 #include "app/theme_provider.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/alternate_nav_url_fetcher.h"
 #include "chrome/browser/extensions/extension_browser_event_router.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/view_ids.h"
 #include "chrome/browser/views/browser_dialogs.h"
 #include "chrome/browser/views/location_bar/content_setting_image_view.h"
 #include "chrome/browser/views/location_bar/ev_bubble_view.h"
 #include "chrome/browser/views/location_bar/keyword_hint_view.h"
 #include "chrome/browser/views/location_bar/location_icon_view.h"
 #include "chrome/browser/views/location_bar/page_action_image_view.h"
 #include "chrome/browser/views/location_bar/page_action_with_badge_view.h"
 #include "chrome/browser/views/location_bar/selected_keyword_view.h"
 #include "chrome/browser/views/location_bar/star_view.h"
 #include "gfx/canvas.h"
 #include "gfx/color_utils.h"
 #include "gfx/skia_util.h"
+#include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "views/drag_utils.h"
 
 #if defined(OS_WIN)
 #include "chrome/browser/views/first_run_bubble.h"
 #endif
 
 using views::View;
 
 // static
 const int LocationBarView::kVertMargin = 2;
 const int LocationBarView::kEdgeThickness = 2;
 const int LocationBarView::kItemPadding = 3;
+const char LocationBarView::kViewClassName[] =
+    "browser/views/location_bar/LocationBarView";
 
 // Convenience: Total space at the edges of the bar.
 const int kEdgePadding =
     LocationBarView::kEdgeThickness + LocationBarView::kItemPadding;
 
 // Padding before the start of a bubble.
 static const int kBubblePadding = kEdgePadding - 1;
 
 // Padding between the location icon and the edit, if they're adjacent.
 static const int kLocationIconEditPadding = LocationBarView::kItemPadding - 1;
@@ skipping 32 matching lines @@
       delegate_(delegate),
       disposition_(CURRENT_TAB),
       location_icon_view_(NULL),
       ev_bubble_view_(NULL),
       location_entry_view_(NULL),
       selected_keyword_view_(NULL),
       keyword_hint_view_(NULL),
       star_view_(NULL),
       mode_(mode),
       force_hidden_count_(0),
+      show_focus_rect_(false),
       ALLOW_THIS_IN_INITIALIZER_LIST(first_run_bubble_(this)) {
   DCHECK(profile_);
   SetID(VIEW_ID_LOCATION_BAR);
   SetFocusable(true);
 
   if (mode_ == NORMAL)
     painter_.reset(new views::HorizontalPainter(kNormalModeBackgroundImages));
 }
 
 LocationBarView::~LocationBarView() {
@@ skipping 41 matching lines @@
   gtk_widget_show_all(location_entry_->GetNativeView());
   // Hide the widget. NativeViewHostGtk will make it visible again as
   // necessary.
   gtk_widget_hide(location_entry_->GetNativeView());
 #endif
   location_entry_view_ = new views::NativeViewHost;
   location_entry_view_->SetID(VIEW_ID_AUTOCOMPLETE);
   AddChildView(location_entry_view_);
   location_entry_view_->set_focus_view(this);
   location_entry_view_->Attach(location_entry_->GetNativeView());
+  location_entry_view_->SetAccessibleName(
+      l10n_util::GetString(IDS_ACCNAME_LOCATION));
 
   selected_keyword_view_ =
       new SelectedKeywordView(kSelectedKeywordBackgroundImages,
                               IDR_OMNIBOX_SEARCH, SK_ColorBLACK, profile_),
   AddChildView(selected_keyword_view_);
   selected_keyword_view_->SetFont(font_);
   selected_keyword_view_->SetVisible(false);
 
   SkColor dimmed_text = GetColor(ToolbarModel::NONE, DEEMPHASIZED_TEXT);
 
@@ skipping 379 matching lines @@
     paint.setAntiAlias(true);
     // The round corners of the omnibox match the round corners of the dropdown
     // below, and all our other bubbles.
     const SkScalar radius(SkIntToScalar(BubbleBorder::GetCornerRadius()));
     bounds.Inset(kEdgeThickness, 0);
     canvas->drawRoundRect(gfx::RectToSkRect(bounds), radius, radius, paint);
   } else {
     canvas->FillRectInt(color, bounds.x(), bounds.y(), bounds.width(),
                         bounds.height());
   }
+
+  if (show_focus_rect_ && HasFocus()) {
+    gfx::Rect r = location_entry_view_->bounds();
+    canvas->DrawFocusRect(r.x() - 1, r.y(), r.width() + 2, r.height());

[sky, 2010/06/21 20:55:32]

Make sure this works for rtl.

+  }
 }
 
 void LocationBarView::VisibleBoundsInRootChanged() {
   location_entry_->ClosePopup();
 }
 
 #if defined(OS_WIN)
 bool LocationBarView::OnMousePressed(const views::MouseEvent& event) {
   UINT msg;
   if (event.IsLeftMouseButton()) {
@@ skipping 265 matching lines @@
   // therefore we need to adjust the X coordinate so that bubble appears on the
   // right hand side of the location bar.
   if (base::i18n::IsRTL())
     origin.set_x(width() - origin.x());
   views::View::ConvertPointToScreen(this, &origin);
   FirstRunBubble::Show(profile_, GetWidget(), gfx::Rect(origin, gfx::Size()),
                        BubbleBorder::TOP_LEFT, bubble_type);
 #endif
 }
 
+std::string LocationBarView::GetClassName() const {
+  return kViewClassName;
+}
+
 bool LocationBarView::SkipDefaultKeyEventProcessing(const views::KeyEvent& e) {
   if (keyword_hint_view_->IsVisible() &&
       views::FocusManager::IsTabTraversalKeyEvent(e)) {
     // We want to receive tab key events when the hint is showing.
     return true;
   }
 
 #if defined(OS_WIN)
   return location_entry_->SkipDefaultKeyEventProcessing(e);
 #else
@@ skipping 152 matching lines @@
         page_action_views_[i]->image_view()->ExecuteAction(kLeftMouseButton,
             false);  // inspect_with_devtools
         return;
       }
       ++current;
     }
   }
 
   NOTREACHED();
 }