Extend the popup-mode location bar out into the nonclient view. This makes p...

chrome/browser/views/location_bar_view.cc

 // Copyright (c) 2006-2008 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_view.h"
 
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/app/theme/theme_resources.h"
@@ skipping 35 matching lines @@
 static const int kBackgroundHoriMargin = 0;
 
 // Padding on the right and left of the entry field.
 static const int kEntryPadding = 3;
 
 // Padding between the entry and the leading/trailing views.
 static const int kInnerPadding = 3;
 
 static const SkBitmap* kBackground = NULL;
 
-static const SkBitmap* kPopupBackgroundLeft = NULL;
-static const SkBitmap* kPopupBackgroundCenter = NULL;
-static const SkBitmap* kPopupBackgroundRight = NULL;
+static const SkBitmap* kPopupBackground = NULL;
 static const int kPopupBackgroundVertMargin = 2;
-static const int kPopupBackgroundHorzMargin = 2;
 
 // The delay the mouse has to be hovering over the lock/warning icon before the
 // info bubble is shown.
 static const int kInfoBubbleHoverDelayMs = 500;
 
 // The tab key image.
 static const SkBitmap* kTabButtonBitmap = NULL;
 
 // Returns the description for a keyword.
 static std::wstring GetKeywordDescription(Profile* profile,
@@ skipping 23 matching lines @@
       security_image_view_(profile, model),
       popup_window_mode_(popup_window_mode),
       first_run_bubble_(this) {
   DCHECK(profile_);
   SetID(VIEW_ID_LOCATION_BAR);
   SetFocusable(true);
 
   if (!kBackground) {
     ResourceBundle &rb = ResourceBundle::GetSharedInstance();
     kBackground = rb.GetBitmapNamed(IDR_LOCATIONBG);
-    kPopupBackgroundLeft =
-      rb.GetBitmapNamed(IDR_LOCATIONBG_POPUPMODE_LEFT);
-    kPopupBackgroundCenter =
-      rb.GetBitmapNamed(IDR_LOCATIONBG_POPUPMODE_CENTER);
-    kPopupBackgroundRight =
-      rb.GetBitmapNamed(IDR_LOCATIONBG_POPUPMODE_RIGHT);
+    kPopupBackground = rb.GetBitmapNamed(IDR_LOCATIONBG_POPUPMODE_CENTER);
   }
 }
 
 bool LocationBarView::IsInitialized() const {
   return location_entry_view_ != NULL;
 }
 
 void LocationBarView::Init() {
   if (popup_window_mode_) {
     font_ = ResourceBundle::GetSharedInstance().GetFont(
@@ skipping 78 matching lines @@
   if (profile_ != profile) {
     profile_ = profile;
     location_entry_->model()->SetProfile(profile);
     selected_keyword_view_.set_profile(profile);
     keyword_hint_view_.set_profile(profile);
     security_image_view_.set_profile(profile);
   }
 }
 
 gfx::Size LocationBarView::GetPreferredSize() {
-  return gfx::Size(
-      0, 
-      std::max(
-          (popup_window_mode_ ? kPopupBackgroundCenter
-                              : kBackground)->height(),
-          security_image_view_.GetPreferredSize().width()));
+  return gfx::Size(0,
+      std::max((popup_window_mode_ ? kPopupBackground : kBackground)->height(),
+               security_image_view_.GetPreferredSize().height()));
 }
 
 void LocationBarView::Layout() {
   DoLayout(true);
 }
 
 void LocationBarView::Paint(ChromeCanvas* canvas) {
   View::Paint(canvas);
 
   SkColor bg = SkColorSetRGB(
       GetRValue(kBackgroundColorByLevel[model_->GetSchemeSecurityLevel()]),
       GetGValue(kBackgroundColorByLevel[model_->GetSchemeSecurityLevel()]),
       GetBValue(kBackgroundColorByLevel[model_->GetSchemeSecurityLevel()]));
 
-  if (popup_window_mode_ == false) {
+  if (popup_window_mode_) {
+    canvas->TileImageInt(*kPopupBackground, 0, 0, width(),
+                         kPopupBackground->height());
+    canvas->FillRectInt(bg, 0, kPopupBackgroundVertMargin, width(),
+        kPopupBackground->height() - (kPopupBackgroundVertMargin * 2));
+  } else {
     int bh = kBackground->height();
-
     canvas->TileImageInt(*kBackground, 0, (height() - bh) / 2, width(),
                          bh);
-
     canvas->FillRectInt(bg, kBackgroundHoriMargin, kBackgroundVertMargin,
                         width() - 2 * kBackgroundHoriMargin,
                         bh - kBackgroundVertMargin * 2);
-  } else {
-    canvas->TileImageInt(*kPopupBackgroundLeft, 0, 0,
-                         kPopupBackgroundLeft->width(),
-                         kPopupBackgroundLeft->height());
-    canvas->TileImageInt(*kPopupBackgroundCenter,
-                         kPopupBackgroundLeft->width(), 0,
-                         width() -
-                            kPopupBackgroundLeft->width() -
-                            kPopupBackgroundRight->width(),
-                         kPopupBackgroundCenter->height());
-    canvas->TileImageInt(*kPopupBackgroundRight,
-                         width() - kPopupBackgroundRight->width(),
-                         0, kPopupBackgroundRight->width(),
-                         kPopupBackgroundRight->height());
-
-    canvas->FillRectInt(bg, kPopupBackgroundHorzMargin,
-                        kPopupBackgroundVertMargin,
-                        width() - kPopupBackgroundHorzMargin * 2,
-                        kPopupBackgroundCenter->height() -
-                        kPopupBackgroundVertMargin * 2);
   }
 }
 
 bool LocationBarView::CanProcessTabKeyEvents() {
   // We want to receive tab key events when the hint is showing.
   return keyword_hint_view_.IsVisible();
 }
 
 void LocationBarView::VisibleBoundsInRootChanged() {
   location_entry_->ClosePopup();
@@ skipping 118 matching lines @@
   if (max_edit_width < 0)
     return;
   const int text_width = TextDisplayWidth();
   bool needs_layout = force_layout;
   needs_layout |= AdjustHints(text_width, max_edit_width);
 
   if (!needs_layout)
     return;
 
   // TODO(sky): baseline layout.
-  const SkBitmap* background = popup_window_mode_ ? kPopupBackgroundCenter
-                                                  : kBackground;
+  const SkBitmap* background =
+      popup_window_mode_ ? kPopupBackground : kBackground;
   int bh = background->height();
   int location_y = ((height() - bh) / 2) + kTextVertMargin;
   int location_height = bh - (2 * kTextVertMargin);
   if (info_label_.IsVisible()) {
     info_label_.SetBounds(width() - kEntryPadding - info_label_size.width(),
                           location_y,
                           info_label_size.width(), location_height);
   }
   if (security_image_view_.IsVisible()) {
     const int info_label_width = info_label_size.width() ?
@@ skipping 591 matching lines @@
     InfoBubble* info_bubble,
     bool closed_by_escape) {
   info_bubble_ = NULL;
 }
 
 bool LocationBarView::OverrideAccelerator(
     const views::Accelerator& accelerator)  {
   return location_entry_->OverrideAccelerator(accelerator);
 }