alternate ntp: focus border of omnibox in ntp

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 55 matching lines @@
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/events/event.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/image/image_skia_operations.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/views/border.h"
 #include "ui/views/button_drag_utils.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/widget/widget.h"
 
 #if defined(OS_WIN) && !defined(USE_AURA)
 #include "chrome/browser/ui/views/omnibox/omnibox_view_win.h"
 #endif
 
@@ skipping 124 matching lines @@
       web_intents_button_view_(NULL),
       action_box_button_view_(NULL),
       mode_(mode),
       show_focus_rect_(false),
       template_url_service_(NULL),
       animation_offset_(0),
       ALLOW_THIS_IN_INITIALIZER_LIST(view_to_focus_(this)) {
   set_id(VIEW_ID_LOCATION_BAR);
 
   if (mode_ == NORMAL) {
-    painter_.reset(
+    background_painter_.reset(
         views::Painter::CreateImagePainter(
             *ui::ResourceBundle::GetSharedInstance().GetImageNamed(
                 IDR_LOCATION_BAR_BORDER).ToImageSkia(),
             gfx::Insets(kBorderRoundCornerHeight, kBorderRoundCornerWidth,
                 kBorderRoundCornerHeight, kBorderRoundCornerWidth),
             true));
   }
 
   edit_bookmarks_enabled_.Init(prefs::kEditBookmarksEnabled,
                                profile_->GetPrefs(), this);
@@ skipping 185 matching lines @@
                                   const chrome::search::Mode& new_mode) {
 #if defined(USE_AURA)
   if (new_mode.animate && old_mode.is_ntp() && new_mode.is_search()) {
     // Fade in so the icons don't pop.
     StartFadeAnimation();
   } else {
     // Cancel any pending animations; switch to the final state immediately.
     StopFadeAnimation();
   }
 #endif
+
+  // Focus border may have changed, schedule paint to redraw.
+  SchedulePaint();
 }
 
 void LocationBarView::Update(const WebContents* tab_for_state_restoring) {
   RefreshContentSettingViews();
   ZoomBubbleView::CloseBubble();
   RefreshZoomView();
   RefreshPageActionViews();
   web_intents_button_view_->Update(GetTabContents());
   open_pdf_in_reader_view_->Update(
       model_->input_in_progress() ? NULL : GetTabContents());
@@ skipping 223 matching lines @@
   int location_y = kVerticalEdgeThickness;
   // In some cases (e.g. fullscreen mode) we may have 0 height.  We still want
   // to position our child views in this case, because other things may be
   // positioned relative to them (e.g. the "bookmark added" bubble if the user
   // hits ctrl-d).
   int location_height = GetInternalHeight(false);
 
   // In NTP mode, hide all location bar decorations.
   if (search_model_ && search_model_->mode().is_ntp()) {
     gfx::Rect location_bounds(0, location_y, width(), location_height);
+    // The location bar border, when drawn, has colored edges that need to be
+    // inset, so that these edges won't be clipped by |location_entry_view_|.
+    // |location_y| and |location_height| already include insets of top and
+    // bottom edges, so we only need to inset for left and right edges here.
+    location_bounds.Inset(kNormalHorizontalEdgeThickness, 0);
     location_entry_view_->SetBoundsRect(location_bounds);
     for (int i = 0; i < child_count(); ++i)
       if (child_at(i) != location_entry_view_)
         child_at(i)->SetVisible(false);
     return;
   }
 
   // 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) ?
@@ skipping 265 matching lines @@
                                       location_bounds.height());
     }
   }
 
   location_entry_view_->SetBoundsRect(location_bounds);
 }
 
 void LocationBarView::OnPaint(gfx::Canvas* canvas) {
   View::OnPaint(canvas);
 
-  if (painter_.get()) {
-    painter_->Paint(canvas, size());
+  // If search mode is |NTP|, paint the background color of NTP page first;
+  // otherwise, there will be a white outline around the location bar border.
+  bool is_search_ntp = search_model_ && search_model_->mode().is_ntp();
+  if (is_search_ntp)
+    canvas->DrawColor(chrome::search::kNTPBackgroundColor);
+
+  if (background_painter_.get()) {
+    background_painter_->Paint(canvas, size());
   } else if (mode_ == POPUP) {
     canvas->TileImageInt(*GetThemeProvider()->GetImageSkiaNamed(
         IDR_LOCATIONBG_POPUPMODE_CENTER), 0, 0, 0, 0, width(), height());
   }
   // When used in the app launcher, don't draw a border, the LocationBarView has
   // its own views::Border.
 
   // Draw the background color so that the graphical elements at the edges
   // appear over the correct color.  (The edit draws its own background, so this
   // isn't important for that.)
@@ skipping 16 matching lines @@
     canvas->sk_canvas()->drawRoundRect(gfx::RectToSkRect(bounds), radius,
                                        radius, paint);
     if (action_box_button_view_)
       PaintActionBoxBackground(canvas, bounds);
   } else {
     canvas->FillRect(bounds, color);
   }
 
   // If |show_focus_rect_| is false but search mode is |NTP|, we still show
   // focus rect.
-  bool is_search_ntp = search_model_ && search_model_->mode().is_ntp();
   bool show_focus_rect = show_focus_rect_ || is_search_ntp;
   if (show_focus_rect && HasFocus()) {
+    if (is_search_ntp) {
+      // Load search focus border mask image if not already loaded.
+      if (!search_focus_painter_.get()) {
+        search_focus_painter_.reset(
+            views::Painter::CreateImagePainter(
+                *ui::ResourceBundle::GetSharedInstance().GetImageNamed(
+                    IDR_LOCATION_BAR_SEARCH_FOCUS_BORDER_MASK).ToImageSkia(),
+                gfx::Insets(kBorderRoundCornerHeight, kBorderRoundCornerWidth,
+                    kBorderRoundCornerHeight, kBorderRoundCornerWidth),
+                true));
+        if (!search_focus_painter_.get())

[dhollowa, 2012/09/20 19:05:11]

This should be a DCHECK.  No return.

[kuan, 2012/09/20 19:47:21]

Done.

+          return;
+      }
+
+      // On first canvas, draw rounded rect with system highlight color.
+      gfx::Canvas border_canvas(size(), canvas->scale_factor(), false);
+      SkPaint paint;
+      paint.setColor(ui::NativeTheme::instance()->GetSystemColor(
+                         ui::NativeTheme::kColorId_FocusedBorderColor));
+      paint.setStyle(SkPaint::kFill_Style);
+      paint.setAntiAlias(true);
+      border_canvas.DrawRoundRect(GetLocalBounds(), kBorderCornerRadius, paint);
+
+      // On second canvas, draw the mask image.
+      gfx::Canvas mask_canvas(size(), canvas->scale_factor(), false);
+      search_focus_painter_->Paint(&mask_canvas, size());
+
+      // Create a masked image from the 2 canvases, and draw the final image
+      // on the destination canvas.
+      gfx::ImageSkia focuse_image =

[dhollowa, 2012/09/20 19:05:11]

nit: s/focuse_image/focus_image/

[kuan, 2012/09/20 19:47:21]

Done.

+          gfx::ImageSkiaOperations::CreateMaskedImage(
+              gfx::ImageSkia(border_canvas.ExtractImageRep()),
+              gfx::ImageSkia(mask_canvas.ExtractImageRep()));
+      canvas->DrawImageInt(focuse_image, 0, 0);
+      return;
+    }
+
     gfx::Rect r = location_entry_view_->bounds();
-
     // TODO(jamescook): Is this still needed?
 #if defined(OS_WIN)
     r.Inset(-1,  -1);
 #else
     r.Inset(-1, 0);
 #endif
     canvas->DrawFocusRect(r);
   }
 }
 
@@ skipping 573 matching lines @@
 }
 
 void LocationBarView::CleanupFadeAnimation() {
   // Since we're no longer animating we don't need our layer.
   SetPaintToLayer(false);
   // Bubble labels don't need a transparent background anymore.
   ev_bubble_view_->SetLabelBackgroundColor(SK_ColorWHITE);
   selected_keyword_view_->SetLabelBackgroundColor(SK_ColorWHITE);
 }
 #endif  // USE_AURA