Fix up the Windows omnibox after the recent endcap removal. This fixes most ...

chrome/browser/views/bubble_border.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/bubble_border.h"
 
 #include "app/resource_bundle.h"
 #include "base/logging.h"
 #include "gfx/canvas.h"
 #include "gfx/path.h"
@@ skipping 55 matching lines @@
     case LEFT_TOP:
     case LEFT_BOTTOM:
       x += w - kArrowOverlap;
       break;
 
     case RIGHT_TOP:
     case RIGHT_BOTTOM:
       x += kArrowOverlap - border_size.width();
       break;
 
+    case NONE:
     case FLOAT:
-    case NONE:
       x += w / 2 - border_size.width() / 2;
       break;
   }
 
   // Calculate bubble y coordinate.
   switch (arrow_location_) {
     case TOP_LEFT:
     case TOP_RIGHT:
       y += h - kArrowOverlap;
       break;
 
     case BOTTOM_LEFT:
     case BOTTOM_RIGHT:
       y += kArrowOverlap - border_size.height();
       break;
 
     case LEFT_TOP:
     case RIGHT_TOP:
       y += h / 2 - arrow_offset;
       break;
 
     case LEFT_BOTTOM:
     case RIGHT_BOTTOM:
       y += h / 2 + arrow_offset - border_size.height();
       break;
 
+    case NONE:
+      y += h;
+      break;
+
     case FLOAT:
       y += h / 2 - border_size.height() / 2;
       break;
-
-    case NONE:
-      y += h;
-      break;
   }
 
   return gfx::Rect(x, y, border_size.width(), border_size.height());
 }
 
 void BubbleBorder::GetInsets(gfx::Insets* insets) const {
   int top = top_->height();
   int bottom = bottom_->height();
   int left = left_->width();
   int right = right_->width();
@@ skipping 12 matching lines @@
     case LEFT_BOTTOM:
       left = std::max(left, left_arrow_->width());
       break;
 
     case RIGHT_TOP:
     case RIGHT_BOTTOM:
       right = std::max(right, right_arrow_->width());
       break;
 
     case NONE:
-      top = 0;
-      break;
-
     case FLOAT:
       // Nothing to do.
       break;
   }
   insets->Set(top, left, bottom, right);
 }
 
 int BubbleBorder::SetArrowOffset(int offset, const gfx::Size& contents_size) {
   gfx::Size border_size(contents_size);
   gfx::Insets insets;
@@ skipping 37 matching lines @@
         std::max(std::max(top_left_->height(), top_right_->height()),
                  std::max(bottom_left_->height(), bottom_right_->height()));
     arrow_offset_ = std::max(offset_x, offset_y);
 
     initialized = true;
   }
 }
 
 void BubbleBorder::Paint(const views::View& view, gfx::Canvas* canvas) const {
   // Convenience shorthand variables.
-  // If |arrow_location_| == NONE, the entire top edge is omitted and height of
-  // corresponding bitmaps is set to 0.
   const int tl_width = top_left_->width();
-  const int tl_height = (arrow_location_ == NONE ? 0 : top_left_->height());
-  const int t_height = (arrow_location_ == NONE ? 0 : top_->height());
+  const int tl_height = top_left_->height();
+  const int t_height = top_->height();
   const int tr_width = top_right_->width();
-  const int tr_height = (arrow_location_ == NONE ? 0 : top_right_->height());
+  const int tr_height = top_right_->height();
   const int l_width = left_->width();
   const int r_width = right_->width();
   const int br_width = bottom_right_->width();
   const int br_height = bottom_right_->height();
   const int b_height = bottom_->height();
   const int bl_width = bottom_left_->width();
   const int bl_height = bottom_left_->height();
 
   gfx::Insets insets;
   GetInsets(&insets);
@@ skipping 13 matching lines @@
     arrow_offset = view.width() - arrow_offset - 1;
   } else if (!is_arrow_on_horizontal(arrow_location_) &&
              !is_arrow_on_top(arrow_location_)) {
     arrow_offset = view.height() - arrow_offset - 1;
   }
 
   // Left edge.
   if (arrow_location_ == LEFT_TOP || arrow_location_ == LEFT_BOTTOM) {
     int start_y = top + tl_height;
     int before_arrow = arrow_offset - start_y - left_arrow_->height() / 2;
-    int after_arrow = height - tl_height - bl_height -
-        left_arrow_->height() - before_arrow;
+    int after_arrow =
+        height - tl_height - bl_height - left_arrow_->height() - before_arrow;
     DrawArrowInterior(canvas,
                       false,
                       left_arrow_->width() - kArrowInteriorHeight,
                       start_y + before_arrow + left_arrow_->height() / 2,
                       kArrowInteriorHeight,
                       left_arrow_->height() / 2 - 1);
     DrawEdgeWithArrow(canvas,
                       false,
                       left_,
                       left_arrow_,
                       left,
                       start_y,
                       before_arrow,
                       after_arrow,
                       left_->width() - left_arrow_->width());
   } else {
     canvas->TileImageInt(*left_, left, top + tl_height, l_width,
                          height - tl_height - bl_height);
   }
 
-  if (arrow_location_ != NONE) {
-    // Top left corner.
-    canvas->DrawBitmapInt(*top_left_, left, top);
+  // Top left corner.
+  canvas->DrawBitmapInt(*top_left_, left, top);
 
-    // Top edge.
-    if (arrow_location_ == TOP_LEFT || arrow_location_ == TOP_RIGHT) {
-      int start_x = left + tl_width;
-      int before_arrow = arrow_offset - start_x - top_arrow_->width() / 2;
-      int after_arrow = width - tl_width - tr_width -
-          top_arrow_->width() - before_arrow;
-      DrawArrowInterior(canvas,
-                        true,
-                        start_x + before_arrow + top_arrow_->width() / 2,
-                        top_arrow_->height() - kArrowInteriorHeight,
-                        1 - top_arrow_->width() / 2,
-                        kArrowInteriorHeight);
-      DrawEdgeWithArrow(canvas,
-                        true,
-                        top_,
-                        top_arrow_,
-                        start_x,
-                        top,
-                        before_arrow,
-                        after_arrow,
-                        top_->height() - top_arrow_->height());
-    } else {
-      canvas->TileImageInt(*top_, left + tl_width, top,
-                           width - tl_width - tr_width, t_height);
-    }
+  // Top edge.
+  if (arrow_location_ == TOP_LEFT || arrow_location_ == TOP_RIGHT) {
+    int start_x = left + tl_width;
+    int before_arrow = arrow_offset - start_x - top_arrow_->width() / 2;
+    int after_arrow =
+        width - tl_width - tr_width - top_arrow_->width() - before_arrow;
+    DrawArrowInterior(canvas,
+                      true,
+                      start_x + before_arrow + top_arrow_->width() / 2,
+                      top_arrow_->height() - kArrowInteriorHeight,
+                      1 - top_arrow_->width() / 2,
+                      kArrowInteriorHeight);
+    DrawEdgeWithArrow(canvas,
+                      true,
+                      top_,
+                      top_arrow_,
+                      start_x,
+                      top,
+                      before_arrow,
+                      after_arrow,
+                      top_->height() - top_arrow_->height());
+  } else {
+    canvas->TileImageInt(*top_, left + tl_width, top,
+                         width - tl_width - tr_width, t_height);
+  }
 
-    // Top right corner.
-    canvas->DrawBitmapInt(*top_right_, right - tr_width, top);
-  }
+  // Top right corner.
+  canvas->DrawBitmapInt(*top_right_, right - tr_width, top);
 
   // Right edge.
   if (arrow_location_ == RIGHT_TOP || arrow_location_ == RIGHT_BOTTOM) {
     int start_y = top + tr_height;
     int before_arrow = arrow_offset - start_y - right_arrow_->height() / 2;
     int after_arrow = height - tl_height - bl_height -
         right_arrow_->height() - before_arrow;
     DrawArrowInterior(canvas,
                       false,
                       right - r_width + kArrowInteriorHeight,
@@ skipping 14 matching lines @@
                          height - tr_height - br_height);
   }
 
   // Bottom right corner.
   canvas->DrawBitmapInt(*bottom_right_, right - br_width, bottom - br_height);
 
   // Bottom edge.
   if (arrow_location_ == BOTTOM_LEFT || arrow_location_ == BOTTOM_RIGHT) {
     int start_x = left + bl_width;
     int before_arrow = arrow_offset - start_x - bottom_arrow_->width() / 2;
-    int after_arrow = width - bl_width - br_width -
-        bottom_arrow_->width() - before_arrow;
+    int after_arrow =
+        width - bl_width - br_width - bottom_arrow_->width() - before_arrow;
     DrawArrowInterior(canvas,
                       true,
                       start_x + before_arrow + bottom_arrow_->width() / 2,
                       bottom - b_height + kArrowInteriorHeight,
                       1 - bottom_arrow_->width() / 2,
                       -kArrowInteriorHeight);
     DrawEdgeWithArrow(canvas,
                       true,
                       bottom_,
                       bottom_arrow_,
@@ skipping 17 matching lines @@
                                      SkBitmap* arrow,
                                      int start_x,
                                      int start_y,
                                      int before_arrow,
                                      int after_arrow,
                                      int offset) const {
   /* Here's what the parameters mean:
    *                     start_x
    *                       .
    *                       .        ┌───┐                 ┬ offset
-   * start_y..........┌────┬────────┤ ▲ ├────────┬────┐   ┴
+   * start_y..........┌────┬────────┤ ▲ ├────────┬────┐
    *                  │  / │--------│∙ ∙│--------│ \  │
    *                  │ /  ├────────┴───┴────────┤  \ │
    *                  ├───┬┘                     └┬───┤
    *                       └───┬────┘   └───┬────┘
    *             before_arrow ─┘            └─ after_arrow
    */
   if (before_arrow) {
     canvas->TileImageInt(*edge, start_x, start_y,
         is_horizontal ? before_arrow : edge->width(),
         is_horizontal ? edge->height() : before_arrow);
@@ skipping 59 matching lines @@
   paint.setColor(border_->background_color());
   gfx::Path path;
   gfx::Rect bounds(view->GetLocalBounds(false));
   SkRect rect;
   rect.set(SkIntToScalar(bounds.x()), SkIntToScalar(bounds.y()),
            SkIntToScalar(bounds.right()), SkIntToScalar(bounds.bottom()));
   SkScalar radius = SkIntToScalar(BubbleBorder::GetCornerRadius());
   path.addRoundRect(rect, radius, radius);
   canvas->drawPath(path, paint);
 }